diff -Nru ceph-0.87/debian/changelog ceph-0.87/debian/changelog
--- ceph-0.87/debian/changelog	2015-01-13 12:33:51.000000000 +0000
+++ ceph-0.87/debian/changelog	2015-01-22 09:54:21.000000000 +0000
@@ -1,3 +1,12 @@
+ceph (0.87-0ubuntu5) vivid; urgency=medium
+
+  * d/p/fix-argparse-defaults.patch: Workaround behavioural change in
+    argparse set_defaults in python 2.7.9 (LP: #1413321).
+  * d/rules: Disable build and support for RocksDB over concerns around
+    performance > 1TB in size.
+
+ -- James Page <james.page@ubuntu.com>  Thu, 22 Jan 2015 09:54:19 +0000
+
 ceph (0.87-0ubuntu4) vivid; urgency=medium
 
   * d/p/ceph-osd-prestart-path.patch: Fixup path for ceph-osd upstart
diff -Nru ceph-0.87/debian/patches/fix-argparse-defaults.patch ceph-0.87/debian/patches/fix-argparse-defaults.patch
--- ceph-0.87/debian/patches/fix-argparse-defaults.patch	1970-01-01 00:00:00.000000000 +0000
+++ ceph-0.87/debian/patches/fix-argparse-defaults.patch	2015-01-22 09:49:40.000000000 +0000
@@ -0,0 +1,26 @@
+Description: Fix argparse usage for Python 2.7.9
+ The behaviour of set_defaults appears to have
+ regressed in python 2.7.9; this patch works around
+ this problem by providing the default for 'cluster'
+ alongside the --cluster option.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1413321
+Forwarded: no
+
+--- a/src/ceph-disk
++++ b/src/ceph-disk
+@@ -2547,7 +2547,6 @@ def parse_args():
+     parser.set_defaults(
+         # we want to hold on to this, for later
+         prog=parser.prog,
+-        cluster='ceph',
+         )
+ 
+     subparsers = parser.add_subparsers(
+@@ -2561,6 +2560,7 @@ def parse_args():
+         '--cluster',
+         metavar='NAME',
+         help='cluster name to assign this disk to',
++        default='ceph',
+         )
+     prepare_parser.add_argument(
+         '--cluster-uuid',
diff -Nru ceph-0.87/debian/patches/series ceph-0.87/debian/patches/series
--- ceph-0.87/debian/patches/series	2015-01-13 12:32:35.000000000 +0000
+++ ceph-0.87/debian/patches/series	2015-01-22 09:43:48.000000000 +0000
@@ -14,3 +14,4 @@
 #use_system_gtest.patch
 virtualenv-never-download.patch
 ceph-osd-prestart-path.patch
+fix-argparse-defaults.patch
diff -Nru ceph-0.87/debian/rules ceph-0.87/debian/rules
--- ceph-0.87/debian/rules	2015-01-13 10:02:13.000000000 +0000
+++ ceph-0.87/debian/rules	2015-01-22 09:52:50.000000000 +0000
@@ -22,12 +22,6 @@
 ## do not build with lttng just yet, see #765842.
 extraopts += --without-lttng
 
-rocksdb_archs = i386 amd64 armhf
-ifneq (,$(filter $(DEB_HOST_ARCH), $(rocksdb_archs)))
-  ## build bundled RocksDB
-  extraopts += --with-librocksdb-static=check
-endif
-
 ifeq ($(DEB_HOST_ARCH), armel)
   # armel supports ARMv4t or above instructions sets.
   # libatomic-ops is only usable with Ceph for ARMv6 or above.
@@ -67,7 +61,6 @@
 override_dh_auto_clean:
 	#$(RM) -rv src/gtest
 	$(RM) -rv src/test/fake_home src/mkfs src/test-ceph-disk/osd
-	dh_auto_clean --sourcedirectory=src/rocksdb
 	dh_auto_clean
 	rm -fv debian/*.upstart