Merge lp:~zulcss/cinder/2013.2.b1 into lp:~openstack-ubuntu-testing/cinder/havana

[Chuck Short]

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-28 19:38:42 +0000
+++ debian/changelog	2013-05-31 14:28:28 +0000
@@ -1,4 +1,4 @@
-cinder (1:2013.2.a278.g05ce36a-0ubuntu1) UNRELEASED; urgency=low
+cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 
   [ Chuck Short ]
   * New upstream version.
@@ -15,29 +15,11 @@
     package build process (its just way to late).
   * debian/control: Drop surplus BD on python-cheetah.
 
- -- Chuck Short <[e-mail]>  Tue, 30 Apr 2013 08:09:08 -0500
-
-cinder (1:2013.2.a226.g1d6de0f-0ubuntu2) 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/rules: Add work around to remove wonky setup.py setup
-  * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary.
-
-  [ James Page ]
-  * debian/control: Drop surplus dependency on python-glance (LP: #1175600).
-  * debian/control,rules: Drop dependency on pep8, don't run pep8 tests during
-    package build process (its just way to late).
-  * debian/control: Drop surplus BD on python-cheetah.
-
   [ Adam Gandelman ]
   * debian/patches/avoid_paramiko_vers_depends.patch: Avoid version
     requirement on paramiko.
 
- -- Adam Gandelman <[e-mail]>  Thu, 23 May 2013 19:12:56 -0700
+ -- Chuck Short <[e-mail]>  Fri, 31 May 2013 09:21:53 -0500
 
 cinder (1:2013.1-0ubuntu2) raring; urgency=low