Gary Lowell 7926ef5393 Merge branch 'next' ... Conflicts: configure.ac src/rgw/rgw_common.cc		2012-11-13 17:29:47 -08:00
..
source
.gitignore	java: update deb bits from ceph-devel feedback	2012-10-19 10:22:38 -07:00
ceph-common.install
ceph-fs-common.install
ceph-fuse.install
ceph-mds.install
ceph-resource-agents.install
ceph.dirs	ceph-create-keys: Create a bootstrap-osd key too.	2012-10-05 11:09:06 -07:00
ceph.docs
ceph.install	upstart, ceph-create-keys: Make client.admin key generation automatic.	2012-08-30 13:41:20 -04:00
ceph.lintian-overrides
ceph.postrm
changelog	v0.54	2012-11-13 13:18:07 -08:00
compat
control	Merge branch 'wip-keystone' into wip-rgw-integration	2012-11-08 17:19:18 -08:00
copyright
libcephfs1.install
libcephfs-dev.install
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
librados-dev.install
librbd1.install
librbd-dev.install
python-ceph.install
radosgw.dirs
radosgw.install
rest-bench.install
rules	java: update deb bits from ceph-devel feedback	2012-10-19 10:22:38 -07:00
watch