Merge lp:~zulcss/nova/grizzly-refresh into lp:~openstack-ubuntu-testing/nova/grizzly

[Chuck Short]

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-12 14:05:25 +0000
+++ debian/changelog	2013-02-20 15:53:20 +0000
@@ -1,4 +1,4 @@
-nova (2013.1~g2-0ubuntu3) UNRELEASED; urgency=low
+nova (2013.1.a4539.g032308c-0ubuntu1) UNRELEASED; urgency=low
 
   [ Chuck Short ]
   * New usptream release. 
@@ -13,6 +13,7 @@
   * debian/nova-common.postinst: Removed config file conversion, since
     the option is no longer available. (LP: #1110567)
   * debian/control: Add python-pyasn1 as a dependency.
+  * debian/control: Add python-oslo-config as a dependency.
 
   [ Adam Gandelman ]
   * debian/control: Fix typo (websocikfy -> websockify).
 
=== modified file 'debian/control'
--- debian/control	2013-02-12 14:05:25 +0000
+++ debian/control	2013-02-20 15:53:20 +0000
@@ -32,6 +32,7 @@
  python-mox,
  python-netaddr,
  python-novaclient (>= 1:2.9.0),
+ python-oslo-config,
  python-paramiko,
  python-paste,
  python-pastedeploy (>= 1.5.0),
 
=== modified file 'debian/patches/avoid_setuptools_git_dependency.patch'
--- debian/patches/avoid_setuptools_git_dependency.patch	2013-01-30 14:40:55 +0000
+++ debian/patches/avoid_setuptools_git_dependency.patch	2013-02-20 15:53:20 +0000
@@ -1,18 +1,18 @@
-diff -Naurp nova-2013.1.orig/setup.py nova-2013.1/setup.py
---- nova-2013.1.orig/setup.py	2013-01-30 06:15:44.000000000 -0600
-+++ nova-2013.1/setup.py	2013-01-30 08:39:13.680907782 -0600
-@@ -43,7 +43,6 @@ setuptools.setup(name='nova',
-       install_requires=requires,
+diff -Naurp nova-2013.1.a4539.g032308c.orig/setup.py nova-2013.1.a4539.g032308c/setup.py
+--- nova-2013.1.a4539.g032308c.orig/setup.py	2013-02-20 09:26:49.000000000 -0600
++++ nova-2013.1.a4539.g032308c/setup.py	2013-02-20 09:34:57.313915950 -0600
+@@ -46,7 +46,6 @@ setuptools.setup(
+       dependency_links=depend_links,
        include_package_data=True,
        test_suite='nose.collector',
 -      setup_requires=['setuptools_git>=0.4'],
        scripts=['bin/nova-all',
                 'bin/nova-api',
                 'bin/nova-api-ec2',
-diff -Naurp nova-2013.1.orig/tools/pip-requires nova-2013.1/tools/pip-requires
---- nova-2013.1.orig/tools/pip-requires	2013-01-30 06:15:44.000000000 -0600
-+++ nova-2013.1/tools/pip-requires	2013-01-30 08:39:26.836907788 -0600
-@@ -19,7 +19,6 @@ paramiko
+diff -Naurp nova-2013.1.a4539.g032308c.orig/tools/pip-requires nova-2013.1.a4539.g032308c/tools/pip-requires
+--- nova-2013.1.a4539.g032308c.orig/tools/pip-requires	2013-02-20 09:26:49.000000000 -0600
++++ nova-2013.1.a4539.g032308c/tools/pip-requires	2013-02-20 09:35:08.525916217 -0600
+@@ -20,7 +20,6 @@ pyasn1
  Babel>=0.9.6
  iso8601>=0.1.4
  httplib2