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	java: update deb bits from ceph-devel feedback	2012-10-19 10:22:38 -07:00
ceph-common.install	packaging fixes around the new ceph cli:	2013-05-21 20:33:23 -07:00
ceph-fs-common.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
ceph-fuse.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
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	debian: include /var/lib/ceph/bootstrap-mds in package	2013-02-13 12:30:22 -08:00
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	preserve /var/lib/ceph on deb/rpm purge	2013-03-22 15:24:51 -07:00
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	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
libcephfs1.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
libcephfs-dev.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
libcephfs-java.jlibs	java: update deb bits from ceph-devel feedback	2012-10-19 10:22:38 -07:00
libcephfs-jni.install	java: update deb bits from ceph-devel feedback	2012-10-19 10:22:38 -07:00
librados2.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
librados-dev.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
librbd1.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
librbd-dev.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
python-ceph.install
radosgw.dirs
radosgw.install	debian: Run wrap-and-sort from devscripts	2013-03-29 13:34:48 +01:00
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	build: Add new rbd-fuse package	2013-01-31 20:35:26 -08:00
rest-bench.install
rules	udev: install disk/by-partuuid rules	2013-05-16 18:40:29 -07:00
watch