neutron

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

  1. grizzly-rc1
  2. Merge into 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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-11 16:24:05 +0000
3+++ debian/changelog 2013-03-15 17:37:29 +0000
4@@ -1,13 +1,13 @@
5-quantum (1:2013.1.a49.g598483f-0ubuntu1) UNRELEASED; urgency=low
6+quantum (1:2013.1~rc1-0ubuntu1) raring; urgency=low
7
8 [ Chuck Short ]
9- * New upstream release.
10 * debian/patches/fix-quantum-configuration.patch: Refreshed
11 * debian/control: Add python-testtools and python-fixtures a build-dep.
12 * debian/control: Drop python-gflags no longer needed.
13 * debian/control: Drop python-unittest2 no longer needed.
14
15 [ James Page ]
16+ * New upstream release candidate.
17 * d/watch: Update uversionmangle to deal with upstream versioning
18 changes, remove tarballs.openstack.org.
19 * d/rules: Disable PEP-8 tests until fixed upstream.
20@@ -24,8 +24,10 @@
21 package and add Depends from quantum-l3-agent and quantum-dhcp-agent.
22 * d/quantum-plugin-nicira.install: Add quantum-check-nvp-config binary.
23 * d/control: Add iputils-arping to quantum-l3-agent Depends (LP: #1153066).
24+ * d/control: python-oslo-config -> python-oslo.config.
25+ * d/control: Bump python-quantumclient >= 1:2.2.0 inline with upstream.
26
27- -- Chuck Short <zulcss@ubuntu.com> Tue, 26 Feb 2013 08:27:14 -0600
28+ -- James Page <james.page@ubuntu.com> Fri, 15 Mar 2013 09:37:28 +0000
29
30 quantum (2013.1.g3-0ubuntu1) raring; urgency=low
31
32
33=== modified file 'debian/control'
34--- debian/control 2013-03-11 16:24:05 +0000
35+++ debian/control 2013-03-15 17:37:29 +0000
36@@ -25,11 +25,11 @@
37 python-netifaces,
38 python-nose,
39 python-novaclient,
40- python-oslo-config,
41+ python-oslo.config,
42 python-paste,
43 python-pastedeploy,
44 python-pyudev,
45- python-quantumclient (>= 1:0.1.0.1-0ubuntu1),
46+ python-quantumclient (>= 1:2.2.0),
47 python-routes,
48 python-setuptools,
49 python-setuptools-git,

Subscribers

People subscribed via source and target branches