Merge lp:~gandelman-a/ubuntu/raring/cinder/2013.1.3 into lp:~ubuntu-server-dev/cinder/grizzly

[Adam Gandelman]

2013.1.3

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-10 17:32:57 +0000
+++ debian/changelog	2013-08-14 18:14:47 +0000
@@ -1,3 +1,38 @@
+cinder (1:2013.1.3-0ubuntu1) raring-proposed; urgency=low
+
+  * Resynchronize with stable/grizzly (2023eec) (LP: #1210447):
+    - [0c86041] Bump stable/grizzly next version to 2013.1.3
+    - [a1c0ba1] Syntax error in hp3par driver LP: 1186566
+    - [e97b555] Cloning a SolidFire volume doesn't work anymore LP: 1188454
+    - [7a15827] cinder thinlvm allocates new snap based volumes outside the
+      pool LP: 1192601
+    - [e58cac5] SolidFire driver should catch Connection Refused error
+      LP: 1195910
+    - [f5b80aa] live migration fails with storwize/svc driver LP: 1179773
+    - [85444f4] Incorrect authorization rule in api.quota LP: 1185974
+    - [78945d0] test_storwize_svc.py fails with
+      storwize_svc_multihostmap_enabled default value (False) LP: 1198146
+    - [2eda2e6] storwize svc driver needs to avoid SVC CLI shortcut
+      LP: 1163964
+    - [82c6ffe] SolidFire _do_clone needs to account for create_from_snapshot
+      as well as clone LP: 1192745
+    - [559b0fa] handle-remaining-connect-fails-cases-in-solidfire-driver
+      LP: 1201592
+    - [bfeae7b] Cannot run cinder-volume with SolidFire driver in
+      active/active LP: 1179671
+    - [68e4e55] some default config options are of the wrong type LP: 1167318
+    - [5ae3c21] unable to discover shares for nfs drivers LP: 1158681
+    - [762c4d2] Pyflakes error in EMC driver LP: 1188619
+    - [5dfb545] need_longer_timeout_setting_for_solidfire_clone LP: 1202007
+    - [c6f2f78] Cinder LVM volume driver does not support secure deletion
+      (CVE-2013-4183) LP: 1198185
+    - [2023eec] [OSSA 2013-023] Potential unsafe XML usage (CVE-2013-4179,
+      CVE-2013-4202) LP: 1190229
+  * debian/rules: Clean new setuptools_git cruft.
+  * debian/control: Set Vcs fields.
+
+ -- Adam Gandelman <[e-mail]>  Fri, 09 Aug 2013 09:59:32 +0100
+
 cinder (1:2013.1.2-0ubuntu1) raring-proposed; urgency=low
 
   * Resynchronize with stable/grizzly (890dc3fe) (LP: #1188788):

=== modified file 'debian/control'
--- debian/control	2013-04-16 21:32:22 +0000
+++ debian/control	2013-08-14 18:14:47 +0000
@@ -38,6 +38,8 @@
  python-webob
 Standards-Version: 3.9.3
 Homepage: http://launchpad.net/cinder
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/grizzly/files
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/cinder/grizzly
 
 Package: python-cinder
 Section: python

=== modified file 'debian/rules'
--- debian/rules	2013-03-25 13:31:36 +0000
+++ debian/rules	2013-08-14 18:14:47 +0000
@@ -23,3 +23,7 @@
 
 override_dh_fixperms:
 	dh_fixperms -Xcinder_tgt.conf
+
+override_dh_clean:
+	dh_auto_clean
+	rm -rf setuptools_git*.egg