ceph/src
Yehuda Sadeh b01ef218b6 Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4
Conflicts:
	src/cls/rgw/cls_rgw_client.cc
	src/cls/rgw/cls_rgw_client.h
	src/rgw/rgw_bucket.cc
	src/rgw/rgw_common.h
	src/rgw/rgw_op.cc
	src/rgw/rgw_rados.cc
	src/rgw/rgw_rados.h

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-22 14:19:22 -08:00
..
arch
auth Ceph Accelio/RDMA Transport (XioMessenger). 2015-01-14 16:43:30 -05:00
bash_completion
brag
civetweb@45da9c5f90
client client: fix getting zero-length xattr 2015-01-16 10:26:19 +08:00
cls Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4 2015-01-22 14:19:22 -08:00
common Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4 2015-01-22 14:19:22 -08:00
crush Merge pull request #3393 from ceph/wip-osd-df 2015-01-21 13:52:53 -08:00
doc doc: mon janitorial list is now a wishlist 2015-01-10 12:09:16 +00:00
erasure-code Merge pull request #3334 from dachary/wip-10216-jerasure-sync 2015-01-19 12:39:36 -08:00
global
gtest
include Merge pull request #3393 from ceph/wip-osd-df 2015-01-21 13:52:53 -08:00
java
jobs
json_spirit Combined CMake Build for Hammer 2015-01-14 16:40:05 -05:00
key_value_store
librados Merge pull request #3385 from majianpeng/misc 2015-01-18 10:41:55 -08:00
libradosstriper
librbd Merge pull request #3164 from ceph/wip-librbd-rados-stub 2015-01-20 00:11:22 -08:00
libs3@dcf98ff04b
log
mds Merge pull request #3402 from ceph/wip-10388 2015-01-21 22:32:24 +08:00
messages Fix make check blockers. 2015-01-14 16:44:47 -05:00
mon Merge pull request #3393 from ceph/wip-osd-df 2015-01-21 13:52:53 -08:00
mount
msg Merge pull request #3425 from vuhuong/wip-xio-fork 2015-01-22 08:20:51 -08:00
objclass
objsync
ocf
os Merge pull request #3459 from athanatos/wip-10603 2015-01-22 11:12:06 -08:00
osd Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4 2015-01-22 14:19:22 -08:00
osdc Merge pull request #3385 from majianpeng/misc 2015-01-18 10:41:55 -08:00
perfglue
powerdns
pybind librbd: Stub out new exclusive image feature 2015-01-07 21:25:04 -05:00
rbd_fuse Build rbd-fuse as a C++ unit (matching its existing linkage). 2015-01-14 16:40:46 -05:00
rbd_replay
rgw Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4 2015-01-22 14:19:22 -08:00
rocksdb@05da5930f3
script
test Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4 2015-01-22 14:19:22 -08:00
tools Merge pull request #3246 from ceph/wip-9780-9781 2015-01-21 16:49:19 -08:00
tracing librbd: Stub out new exclusive image feature 2015-01-07 21:25:04 -05:00
upstart
.gitignore Merge pull request #3335 from ceph/wip-cephfs-tabletool 2015-01-15 21:58:17 -08:00
btrfs_ioc_test.c
ceph_common.sh
ceph_fuse.cc
ceph_mds.cc Cosmetic ceph_mds.cc. 2015-01-14 16:42:57 -05:00
ceph_mon.cc Merge remote-tracking branch 'gh/wip-xio' 2015-01-18 10:37:19 -08:00
ceph_osd.cc Cosmetic ceph_osd.cc. 2015-01-14 16:43:08 -05:00
ceph_syn.cc Cosmetic: Normalize an entity_name_t initialization in ceph-syn. 2015-01-14 16:41:40 -05:00
ceph_ver.c
ceph_ver.h.in.cmake Combined CMake Build for Hammer 2015-01-14 16:40:05 -05:00
ceph-clsinfo
ceph-coverage.in
ceph-create-keys
ceph-crush-location.in
ceph-debugpack.in
ceph-disk
ceph-disk-activate
ceph-disk-prepare
ceph-disk-udev
ceph-osd-prestart.sh
ceph-post-file.in
ceph-rbdnamer
ceph-rest-api
ceph-run
ceph.conf.twoosds
ceph.in
ceph.in.cmake Combined CMake Build for Hammer 2015-01-14 16:40:05 -05:00
cephfs.cc
check_version
cls_acl.cc
cls_crypto.cc
CMakeLists.txt cmake: Fix CMakelist.txt to remove depleted files 2015-01-19 12:56:48 -08:00
cmonctl
fetch_config
init-ceph.in
init-radosgw
init-radosgw.sysv
init-rbdmap
krbd.cc
libcephfs.cc
librados-config.cc
loadclass.sh
logrotate.conf
make_version
Makefile-env.am
Makefile.am Merge remote-tracking branch 'gh/wip-xio' 2015-01-18 10:37:19 -08:00
mount.fuse.ceph
multi-dump.sh
ps-ceph.pl
push_to_qemu.pl
rbd-replay-many
rbd.cc Merge branch 'next' 2015-01-21 16:11:43 -08:00
rbdmap
README
sample.ceph.conf
stop.sh
TODO
unittest_bufferlist.sh
valgrind.supp
verify-mds-journal.sh
vstart.sh
yasm-wrapper

Sage Weil <sage@newdream.net>
Ceph - scalable distributed storage system