Josh Durgin 7d11b6b9d1 Merge remote-tracking branch 'origin/next' ... Conflicts: src/Makefile-client.am (link rbd to libglobal again)		2015-08-04 18:13:52 -07:00
..
test_daemon.sh	qa/workunits/cephtool/test_daemon.sh: verify ceph -c works with daemon	2014-07-30 14:52:48 -07:00
test.sh	Merge remote-tracking branch 'origin/next'	2015-08-04 18:13:52 -07:00