ceph/debian
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
..
source
.gitignore
ceph-common.install packaging fixes around the new ceph cli: 2013-05-21 20:33:23 -07:00
ceph-fs-common.install
ceph-fuse.install
ceph-mds.install
ceph-mds.postinst debian: guard upstart {start,stop} with -x check 2013-05-30 17:23:36 -07:00
ceph-mds.prerm debian: guard upstart {start,stop} with -x check 2013-05-30 17:23:36 -07:00
ceph-resource-agents.install
ceph-test.install Merge branch 'wip-ceph-cli' into master 2013-06-06 20:08:15 -07:00
ceph.dirs
ceph.docs
ceph.install udev: install disk/by-partuuid rules 2013-05-16 18:40:29 -07:00
ceph.lintian-overrides
ceph.postinst debian: guard upstart {start,stop} with -x check 2013-05-30 17:23:36 -07:00
ceph.postrm
ceph.prerm debian: guard upstart {start,stop} with -x check 2013-05-30 17:23:36 -07:00
changelog v0.63 2013-05-28 13:58:22 -07:00
compat
control Merge remote-tracking branch 'origin/master' into wip-ceph-cli 2013-06-04 13:12:08 -07:00
copyright
libcephfs1.install
libcephfs-dev.install
libcephfs-java.jlibs
libcephfs-jni.install
librados2.install
librados-dev.install
librbd1.install
librbd-dev.install
python-ceph.install
radosgw.dirs
radosgw.install
radosgw.postinst debian: guard upstart {start,stop} with -x check 2013-05-30 17:23:36 -07:00
radosgw.prerm debian: guard upstart {start,stop} with -x check 2013-05-30 17:23:36 -07:00
rbd-fuse.install
rest-bench.install
rules udev: install disk/by-partuuid rules 2013-05-16 18:40:29 -07:00
watch