Merge lp:~zulcss/python-cinderclient/testr into lp:~ubuntu-server-dev/python-cinderclient/grizzly

[Chuck Short]

Fixes ftbfs.

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-10 19:37:50 +0000
+++ debian/changelog	2013-01-29 15:53:57 +0000
@@ -1,3 +1,10 @@
+python-cinderclient (1:1.0.2.11.gf0a6dee-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control: Drop python-nose in favor of testrepository.
+
+ -- Chuck Short <[e-mail]>  Tue, 29 Jan 2013 09:45:06 -0600
+
 python-cinderclient (1:1.0.2.3.g61e2a42-0ubuntu1) raring; urgency=low
 
   [ Adam Gandelman ]
 
=== modified file 'debian/control'
--- debian/control	2013-01-03 13:36:52 +0000
+++ debian/control	2013-01-29 15:53:57 +0000
@@ -4,7 +4,6 @@
 Maintainer: Chuck Short <[e-mail]>
 Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6),
  python-setuptools,
- python-nose,
  python-httplib2,
  python-requests,
  python-prettytable,
@@ -15,7 +14,8 @@
  python-unittest2,
  python-setuptools-git (>= 0.4),
  python-testtools,
- python-fixtures
+ python-fixtures,
+ testrepository
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.5