Merge branch 'wip-rgw-bench'

Conflicts:
	debian/rules

diff --cc debian/control
Simple merge

diff --cc debian/rules
index 5d02e96ac793fb9396bb18bc2826b49686954bd6,e80d95e5a63abe05daa109347579e0e80681950b..84f3daa2789dd5054c3396da963597121a711677
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -116,6 -116,8 +116,7 @@@ binary-arch: build instal
        dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg
        dh_strip -pradosgw --dbg-package=radosgw-dbg
        dh_strip -pgceph --dbg-package=gceph-dbg
 -      dh_strip -plibrgw1 --dbg-package=librgw1-dbg
+       dh_strip -prest-bench --dbg-package=rest-bench-dbg
  
        dh_compress
        dh_fixperms

diff --cc src/Makefile.am
Simple merge