[openstack-quantum/el6: 2/2] Merge branch 'f17' into el6
Pádraig Brady
pbrady at fedoraproject.org
Wed Jul 25 23:50:45 UTC 2012
commit be553208173695c0023c9295ab47f0116ac0307c
Merge: 5b07492 48e78d8
Author: Pádraig Brady <P at draigBrady.com>
Date: Thu Jul 26 00:48:57 2012 +0100
Merge branch 'f17' into el6
Conflicts:
openstack-quantum.spec
.gitignore | 2 +-
openstack-quantum.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc openstack-quantum.spec
index 18ce0c8,1868a84..f01cfd2
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@@ -4,7 -4,7 +4,7 @@@
Name: openstack-quantum
Version: 2012.1
- Release: 5%{?dist}
-Release: 4%{?dist}
++Release: 6%{?dist}
Summary: Virtual network service for OpenStack (quantum)
Group: Applications/System
@@@ -434,17 -398,53 +434,20 @@@ f
%changelog
-* 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
More information about the scm-commits
mailing list