Dan Mick 3ac6ffe802 Merge branch 'wip-ceph-cli' into master ... Conflicts: src/include/rados/librados.h src/librados/librados.cc src/osdc/Objecter.cc src/pybind/rados.py Required modifications to: src/osd/OSD.cc Signed-off-by: Dan Mick <dan.mick@inktank.com>		2013-06-06 20:08:15 -07:00
..
clone.sh	rados: add whole-object 'clonedata' command	2013-05-06 16:45:12 -07:00
load-gen-big.sh
load-gen-mix-small-long.sh
load-gen-mix-small.sh
load-gen-mix.sh
load-gen-mostlyread.sh
stress_watch.sh
test_pool_quota.sh
test_python.sh
test.sh	Merge branch 'wip-ceph-cli' into master	2013-06-06 20:08:15 -07:00