Merge lp:~zulcss/cinder/cinder-g2 into lp:~openstack-ubuntu-testing/cinder/grizzly

[Chuck Short]

cinder g2

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-10 14:26:50 +0000
+++ debian/changelog	2013-01-11 14:01:20 +0000
@@ -1,9 +1,10 @@
-cinder (2013.1~g2~20130107.490-0ubuntu1) UNRELEASED; urgency=low
+cinder (2013.1~g2-0ubuntu1) raring; urgency=low
 
   [ Chuck Short ]
   * New upstream release. 
   * debian/patches/avoid_setuptools_git_dependency.patch: Rediff
     due to upstream changes.
+  * debian/control: Add python-keystoneclient as a dependency
 
   [ James Page ]
   * Improve upstart configurations:
@@ -19,7 +20,7 @@
   * d/patches, d/control: adding stevedore dependency, merging deps patches
   * d/patches: remove failing tests
 
- -- Yolanda Robla Mota <[e-mail]>  Wed, 09 Jan 2013 16:45:00 +0100
+ -- Chuck Short <[e-mail]>  Fri, 11 Jan 2013 07:33:57 -0600
 
 cinder (2013.1~g1-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-01-10 12:31:13 +0000
+++ debian/control	2013-01-11 14:01:20 +0000
@@ -19,6 +19,7 @@
  python-webob,
  python-greenlet,
  python-glanceclient,
+ python-keystoneclient,
  python-pastedeploy,
  python-paste,
  python-migrate,