]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-ceph-cli' into master
authorDan Mick <dan.mick@inktank.com>
Fri, 7 Jun 2013 02:12:32 +0000 (19:12 -0700)
committerDan Mick <dan.mick@inktank.com>
Fri, 7 Jun 2013 03:08:15 +0000 (20:08 -0700)
commit3ac6ffe802eeeae6614c6989b643eff2a3a11f2e
tree0ada0a8162c560122628c6df195ce8090e53782d
parent5c30844762e269b79160816fc05bfe9ec3cd72ea
parentfaa1ae76946c837d8641297847b0fa9ce5177fc3
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>
15 files changed:
ceph.spec.in
debian/ceph-test.install
qa/workunits/rados/test.sh
src/Makefile.am
src/include/rados/librados.h
src/include/rados/librados.hpp
src/librados/RadosClient.cc
src/librados/RadosClient.h
src/librados/librados.cc
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/osdc/Objecter.cc
src/osdc/Objecter.h
src/pybind/rados.py
src/vstart.sh