summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog6
-rwxr-xr-xqa/workunits/rbd/map-snapshot-io.sh7
3 files changed, 14 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index cb49a0b2fe1..eeed31fd55c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_PREREQ(2.59)
# VERSION define is not used by the code. It gets a version string
# from 'git describe'; see src/ceph_ver.[ch]
-AC_INIT([ceph], [0.56], [ceph-devel@vger.kernel.org])
+AC_INIT([ceph], [0.57], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
RPM_RELEASE=0
diff --git a/debian/changelog b/debian/changelog
index d8a44743908..a4edd09826b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.57-1) quantal; urgency=low
+
+ * New upstream release
+
+ -- Gary Lowell <gary.lowell@inktank.com> Tue, 19 Feb 2013 10:06:39 -0800
+
ceph (0.56-1) quantal; urgency=low
* New upstream release
diff --git a/qa/workunits/rbd/map-snapshot-io.sh b/qa/workunits/rbd/map-snapshot-io.sh
index 882bf5d2dbc..c16030e2d8e 100755
--- a/qa/workunits/rbd/map-snapshot-io.sh
+++ b/qa/workunits/rbd/map-snapshot-io.sh
@@ -15,8 +15,15 @@ rbd snap create image@s1
dd if=/dev/zero of=/dev/rbd/rbd/image oflag=direct count=10 # used to fail
rbd snap rm image@s1
dd if=/dev/zero of=/dev/rbd/rbd/image oflag=direct count=10
+
+udevadm settle # udev is does blkid on device close; yeesh! see #4183
+
rbd unmap /dev/rbd/rbd/image
rbd rm image
+# wait a few seconds for the async kernel bits to clean themselves up
+sleep 4
+rbd rm image || :
+
echo OK