[openstack-quantum/el6: 2/2] Merge branch 'f17' into el6

[Alan Pevec]

commit 754ec20c6052ab08adccc6f58073807ee9fa132d
Merge: be55320 b18b2cf
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Aug 20 22:28:26 2012 +0200

    Merge branch 'f17' into el6
    
    Conflicts:
    	openstack-quantum.spec

 openstack-quantum.spec |    5 ++++-
 quantum-node-setup     |    5 +----
 quantum-server-setup   |    5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --cc openstack-quantum.spec
index f01cfd2,e7ce121..106aca4
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:		openstack-quantum
  Version:	2012.1
- Release:	6%{?dist}
 -Release:	5%{?dist}
++Release:	7%{?dist}
  Summary:	Virtual network service for OpenStack (quantum)
  
  Group:		Applications/System
@@@ -434,20 -398,56 +434,23 @@@ f
  
  
  %changelog
 -* Sun Aug 12 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-5
++* Sun Aug 12 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-7
+ - Update setup scripts for new DB configuration valiable
+ 
 -* Wed Jul 25 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-4
 +* Wed Jul 25 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-6
  - Update to 20120715 essex stable branch snapshot
  
 -* Mon May 28 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
 +* Mon May 28 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-5
  - Fix helper scripts to use the always available openstack-config util
  
 -* Mon Apr  9 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-1
 -- Update to essex release
 -
 -* Thu Apr  5 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.7.rc2
 -- Update to essex rc2 milestone
 -- Use PrivateTmp for services
 -
 -* Wed Mar 21 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.6.rc1
 -- Update to official essex rc1 milestone
 -- Add quantum-server-setup and quantum-node-setup scripts
 -- Use hand-coded agent executables rather than easy-install scripts
 -- Make plugin config files mode 640 and group quantum to protect passwords
 -
 -* Mon Mar 19 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.5.e4
 -- Update to essex possible RC1 tarball
 -- Remove patches incorporated upstream
 -- Don't package test code
 -- Remove dependencies only needed by test code
 -
 -* Wed Mar 14 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.4.e4
 -- Upstream patch: add root_helper to quantum agents
 -- Add sudoers file enabling quantum-rootwrap for quantum user
 -- Configure plugin agents to use quantum-rootwrap
 -- Run plugin agents as quantum user
 -
 -* Fri Mar  9 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.3.e4
 -- Add upstream patch: remove pep8 and strict lxml version from setup.py
 -- Remove old fix for pep8 dependency
 -- Add upstream patch: Bug #949261 Removing nova drivers for Linux Bridge Plugin
 -- Add openvswitch dependency
 -
 -* Mon Mar  5 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.2.e4
 -- Update to essex milestone 4
 -- Move plugins to sub-packages
 -- Systemd units for agents
 -
 -* Mon Jan 31 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.1.e3
 -- Update to essex milestone 3 for F17
 -
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011.3-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Thu Nov  18 2011 Robert Kukura <rkukura at redhat.com> - 2011.3-1
 -- Initial package for Fedora
 +* Mon May 07 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-4
 +- Fix handling of the mysql service in quantum-server-setup
 +
 +* Tue May 01 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
 +- Start the services later in the boot sequence
 +
 +* Wed Apr 25 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
 +- Use parallel installed versions of python-routes and python-paste-deploy
 +
 +* Thu Apr 12 2012 Pádraig Brady <pbrady at redhat.com> - 2012.1-1
 +- Initial essex release