Merge remote-tracking branch 'gh/wip-rbd-bench'

Conflicts:
	ceph.spec.in
	debian/ceph-test.install
	src/.gitignore

diff --cc ceph.spec.in
index 7dcd0844a7ac9ba5599b679f5e67ade4804f4535,8fbb8799fd6d93988385bdd2e58474bf472aa786..7efb9889a740f137e59d4dc67d9a5f829517bc18
--- 1/ceph.spec.in
--- 2/ceph.spec.in
+++ b/ceph.spec.in
@@@ -531,7 -508,7 +531,8 @@@ f
  %{_bindir}/smalliobench
  %{_bindir}/smalliobenchdumb
  %{_bindir}/smalliobenchfs
+ %{_bindir}/smalliobenchrbd
 +%{_bindir}/ceph-filestore-dump
  %{_bindir}/streamtest
  %{_bindir}/test_cfuse_cache_invalidate
  %{_bindir}/test_cls_lock

diff --cc debian/ceph-test.install
index 96cb33dce557dda78909daab9daff42543efd371,aff61c186b67ce37efd7537df9010584b5e4fe6b..7bda9edc5af14d18dfc0d8b560bd4d4a713628df
--- 1/debian/ceph-test.install
--- 2/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@@ -12,7 -12,7 +12,8 @@@ usr/bin/scratchtoolp
  usr/bin/smalliobench
  usr/bin/smalliobenchdumb
  usr/bin/smalliobenchfs
+ usr/bin/smalliobenchrbd
 +usr/bin/ceph-filestore-dump
  usr/bin/streamtest
  usr/bin/test_cfuse_cache_invalidate
  usr/bin/test_cls_lock

diff --cc src/.gitignore
index e2038b453b2b13f46559afb58067523e56cf6722,324e33a231b814a484638d017be7f9fd45ff3932..f05c939cbc705277e109160b3394d9d4f392d219
--- 1/src/.gitignore
--- 2/src/.gitignore
+++ b/src/.gitignore
@@@ -112,4 -111,8 +112,9 @@@ Makefil
  /test_librbd_fsx
  /scratchtool
  /scratchtoolpp
 -/tpbench
 +/ceph-filestore-dump
+ /smalliobench
+ /smalliobenchdumb
+ /smalliobenchfs
+ /smalliobenchrbd
++/tpbench

diff --cc src/Makefile.am
Simple merge