--- a/components/openstack/cinder/patches/06-enable-dd.patch	Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/cinder/patches/06-enable-dd.patch	Fri May 20 17:42:29 2016 -0400
@@ -1,9 +1,10 @@
-In-house supporting volume_dd_blocksize ('1M', 'G') to enable 'dd' to run on Solaris. This patch
-is Solaris-specific and not suitable for upstream.
+In-house supporting volume_dd_blocksize ('1M', 'G') to enable 'dd' to
+run on Solaris. This patch is Solaris-specific and not suitable for
+upstream.
 
---- cinder-2014.2.2/cinder/volume/utils.py.old	2015-10-20 12:55:15.089090904 -0700
-+++ cinder-2014.2.2/cinder/volume/utils.py	2015-10-20 12:55:23.640892844 -0700
-@@ -281,6 +281,7 @@
+--- cinder-2015.1.2/cinder/volume/utils.py.orig	2015-11-17 18:29:59.168650488 -0800
++++ cinder-2015.1.2/cinder/volume/utils.py	2015-11-17 18:30:21.197972544 -0800
+@@ -267,6 +267,7 @@
          bs = strutils.string_to_bytes('%sB' % blocksize)
  
      count = math.ceil(size_in_m * units.Mi / bs)