merge master again (2.0-10 changelog only)

diff --combined sfa.spec
index 78344d6,52e55dc..963abef
--- 1/sfa.spec
--- 2/sfa.spec
+++ b/sfa.spec
@@@ -1,6 -1,6 +1,6 @@@
  %define name sfa
 -%define version 2.0
 -%define taglevel 10
 +%define version 2.1
 +%define taglevel 0
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  %global python_sitearch       %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@@ -24,10 -24,7 +24,10 @@@ URL: %{SCMURL
  Summary: the SFA python libraries
  Group: Applications/System
  BuildRequires: make
 +
 +Requires: myplc-config
  Requires: python >= 2.5
 +Requires: pyOpenSSL >= 0.7
  Requires: m2crypto
  Requires: xmlsec1-openssl-devel
  Requires: libxslt-python
@@@ -43,10 -40,8 +43,10 @@@ Requires: python-dateuti
  Requires: postgresql >= 8.2, postgresql-server >= 8.2
  Requires: postgresql-python
  Requires: python-psycopg2
 -Requires: pyOpenSSL >= 0.7
 -Requires: myplc-config
 +# f8=0.4 - f12=0.5 f14=0.6 f16=0.7
 +Requires: python-sqlalchemy
 +Requires: python-migrate
 +# the eucalyptus aggregate uses this module
  Requires: python-xmlbuilder
   
  # python 2.5 has uuid module added, for python 2.4 we still need it.
@@@ -153,7 -148,7 +153,7 @@@ rm -rf $RPM_BUILD_ROO
  %config /etc/sfa/default_config.xml
  %config (noreplace) /etc/sfa/aggregates.xml
  %config (noreplace) /etc/sfa/registries.xml
 -/usr/share/sfa/sfa.sql
 +/usr/share/sfa/migrations
  /usr/share/sfa/examples
  /var/www/html/wsdl/*.wsdl
  
@@@ -202,18 -197,18 +202,18 @@@
  %files tests
  %{_datadir}/sfa/tests
  
 -### sfa-plc installs the 'sfa' service
 -%post plc
 +### sfa installs the 'sfa' service
 +%post 
  chkconfig --add sfa
  
 -%preun plc
 +%preun 
  if [ "$1" = 0 ] ; then
    /sbin/service sfa stop || :
    /sbin/chkconfig --del sfa || :
  fi
  
 -%postun plc
 -[ "$1" -ge "1" ] && service sfa restart
 +%postun
 +[ "$1" -ge "1" ] && { service sfa dbdump ; service sfa restart ; }
  
  ### sfa-cm installs the 'sfa-cm' service
  %post cm
@@@ -229,6 -224,15 +229,15 @@@ f
  [ "$1" -ge "1" ] && service sfa-cm restart || :
  
  %changelog
+ * Wed Jan 25 2012 Tony Mack <tmack@cs.princeton.edu> - sfa-2.0-10
+ - client: added -R --raw sfi cmdline option that displays raw server response.
+ - client: request GENI RSpec by default. 
+ - server: remove database dependencies from sfa.server.sfaapi.
+ - server: increased default credential lifetime to 31 days.
+ - bugfix: fixed bug in sfa.storage.record.SfaRecord.delete().
+ - bugfix: fixed server key path in sfa.server.sfa-clean-peer-records.
+ - bugfix: fixed bug in sfa.server.sfa-start.install_peer_certs(). 
+  
  * Sat Jan 7 2012 Tony Mack <tmack@cs.princeton.edu> - sfa-2.0-9
  - bugfix: 'geni_api' should be in the top level struct, not the code struct
  - bugfix: Display the correct host and port in 'geni_api_versions' field of the GetVersion