Merge lp:~james-page/neutron/grizzly-rc1 into lp:~openstack-ubuntu-testing/neutron/grizzly

Proposed by James Page
Status: Merged
Approved by: Adam Gandelman
Approved revision: 143
Merged at revision: 143
Proposed branch: lp:~james-page/neutron/grizzly-rc1
Merge into: lp:~openstack-ubuntu-testing/neutron/grizzly
Diff against target: 49 lines (+7/-5)
2 files modified
debian/changelog (+5/-3)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~james-page/neutron/grizzly-rc1
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+153606@code.launchpad.net

Description of the change

Quantum Grizzly RC1 - w00t!

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-11 16:24:05 +0000
+++ debian/changelog 2013-03-15 17:37:29 +0000
@@ -1,13 +1,13 @@
1quantum (1:2013.1.a49.g598483f-0ubuntu1) UNRELEASED; urgency=low1quantum (1:2013.1~rc1-0ubuntu1) raring; urgency=low
22
3 [ Chuck Short ]3 [ Chuck Short ]
4 * New upstream release.
5 * debian/patches/fix-quantum-configuration.patch: Refreshed4 * debian/patches/fix-quantum-configuration.patch: Refreshed
6 * debian/control: Add python-testtools and python-fixtures a build-dep.5 * debian/control: Add python-testtools and python-fixtures a build-dep.
7 * debian/control: Drop python-gflags no longer needed.6 * debian/control: Drop python-gflags no longer needed.
8 * debian/control: Drop python-unittest2 no longer needed.7 * debian/control: Drop python-unittest2 no longer needed.
98
10 [ James Page ]9 [ James Page ]
10 * New upstream release candidate.
11 * d/watch: Update uversionmangle to deal with upstream versioning11 * d/watch: Update uversionmangle to deal with upstream versioning
12 changes, remove tarballs.openstack.org.12 changes, remove tarballs.openstack.org.
13 * d/rules: Disable PEP-8 tests until fixed upstream.13 * d/rules: Disable PEP-8 tests until fixed upstream.
@@ -24,8 +24,10 @@
24 package and add Depends from quantum-l3-agent and quantum-dhcp-agent.24 package and add Depends from quantum-l3-agent and quantum-dhcp-agent.
25 * d/quantum-plugin-nicira.install: Add quantum-check-nvp-config binary.25 * d/quantum-plugin-nicira.install: Add quantum-check-nvp-config binary.
26 * d/control: Add iputils-arping to quantum-l3-agent Depends (LP: #1153066).26 * d/control: Add iputils-arping to quantum-l3-agent Depends (LP: #1153066).
27 * d/control: python-oslo-config -> python-oslo.config.
28 * d/control: Bump python-quantumclient >= 1:2.2.0 inline with upstream.
2729
28 -- Chuck Short <zulcss@ubuntu.com> Tue, 26 Feb 2013 08:27:14 -060030 -- James Page <james.page@ubuntu.com> Fri, 15 Mar 2013 09:37:28 +0000
2931
30quantum (2013.1.g3-0ubuntu1) raring; urgency=low32quantum (2013.1.g3-0ubuntu1) raring; urgency=low
3133
3234
=== modified file 'debian/control'
--- debian/control 2013-03-11 16:24:05 +0000
+++ debian/control 2013-03-15 17:37:29 +0000
@@ -25,11 +25,11 @@
25 python-netifaces,25 python-netifaces,
26 python-nose,26 python-nose,
27 python-novaclient,27 python-novaclient,
28 python-oslo-config,28 python-oslo.config,
29 python-paste,29 python-paste,
30 python-pastedeploy,30 python-pastedeploy,
31 python-pyudev,31 python-pyudev,
32 python-quantumclient (>= 1:0.1.0.1-0ubuntu1),32 python-quantumclient (>= 1:2.2.0),
33 python-routes,33 python-routes,
34 python-setuptools,34 python-setuptools,
35 python-setuptools-git,35 python-setuptools-git,

Subscribers

People subscribed via source and target branches