Merge lp:~james-page/cinder/havana2 into lp:~ubuntu-server-dev/cinder/havana

[James Page]

Havana 2 release.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-17 18:32:24 +0000
+++ debian/changelog	2013-07-19 13:16:29 +0000
@@ -1,7 +1,6 @@
-cinder (1:2013.2.a359.g5be6852-0ubuntu1) UNRELEASED; urgency=low
+cinder (1:2013.2~b2-0ubuntu1) saucy; urgency=low
 
   [ Chuck Short ]
-  * New upstream release.
   * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
   * debian/control: Add missing testrepostory.
   * debian/rules: Use testr directly.
@@ -13,9 +12,11 @@
     - Add minimum requirement python-kombu (>= 2.5.12).
 
   [ James Page ]
+  * New upstream release.
   * d/control: Update VCS fields for new branch locations.
+  * d/rules: Run unit tests in parallel.
 
- -- Adam Gandelman <[e-mail]>  Mon, 01 Jul 2013 18:59:19 -0700
+ -- James Page <[e-mail]>  Fri, 19 Jul 2013 14:14:40 +0100
 
 cinder (1:2013.2~b1-0ubuntu2) saucy; urgency=low
 

=== modified file 'debian/rules'
--- debian/rules	2013-07-16 15:46:29 +0000
+++ debian/rules	2013-07-19 13:16:29 +0000
@@ -11,7 +11,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	testr init && testr run
+	testr init && testr run --parallel
 endif
 
 override_dh_install: