Merge lp:~zulcss/cinder/cinder-fixtures-deps into lp:~openstack-ubuntu-testing/cinder/havana

[Chuck Short]

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-17 17:05:27 +0000
+++ debian/changelog	2013-05-27 16:56:23 +0000
@@ -1,10 +1,11 @@
-cinder (1:2013.2.a226.g1d6de0f-0ubuntu1) UNRELEASED; urgency=low
+cinder (1:2013.2.a278.g05ce36a-0ubuntu1) UNRELEASED; urgency=low
 
   [ Chuck Short ]
   * New upstream version.
   * debian/patches/fix_cinder_dependencies.patch: Dropped.
   * debian/control: Bump standards version to 3.9.4.
   * debian/control: Add python-pbr and python-d2to1 to build-depends.
+  * debian/control: Add python-testtools and python-fixtures to build-depends
   * debian/rules: Add work around to remove wonky setup.py setup
   * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary.
 

=== modified file 'debian/control'
--- debian/control	2013-05-17 17:05:27 +0000
+++ debian/control	2013-05-27 16:56:23 +0000
@@ -9,6 +9,7 @@
  python-coverage,
  python-d2to1,
  python-eventlet,
+ python-fixtures,
  python-glanceclient,
  python-greenlet,
  python-hp3parclient (>= 1.0.0),
@@ -35,6 +36,7 @@
  python-sqlalchemy,
  python-stevedore (>= 0.8),
  python-suds,
+ python-testtools,
  python-webob
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/cinder