Gary Lowell 7926ef5393 Merge branch 'next' ... Conflicts: configure.ac src/rgw/rgw_common.cc		2012-11-13 17:29:47 -08:00
..
source
.gitignore
ceph-common.install
ceph-fs-common.install
ceph-fuse.install
ceph-mds.install
ceph-resource-agents.install
ceph.dirs
ceph.docs
ceph.install
ceph.lintian-overrides
ceph.postrm
changelog
compat
control
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
rest-bench.install
rules
watch