]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6d31e5d 50653cf)
Merge branch 'wip-conf-root' of https://github.com/liewegas/ceph
authorSage Weil <sage@redhat.com>
Mon, 7 Mar 2016 20:36:13 +0000 (15:36 -0500)
committerSage Weil <sage@redhat.com>
Mon, 7 Mar 2016 20:36:13 +0000 (15:36 -0500)
commit37f14a5d94b80c921809e45f5759063e3465b521
tree89181e012d2ddb6b671d51936692cb8f1a543299tree | snapshot
parent6d31e5dfa8089e8fd5bda2d845ca130321d804e2commit | diff
parent50653cf83df421111b1ee10b03800b5ed9b1f690commit | diff
Merge branch 'wip-conf-root' of https://github.com/liewegas/ceph

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/common/config.cc
12 files changed:
src/common/admin_socket.cc diff1 | diff2 | blob | history
src/common/admin_socket.h diff1 | diff2 | blob | history
src/common/ceph_context.cc diff1 | diff2 | blob | history
src/common/common_init.h diff1 | diff2 | blob | history
src/common/config.cc diff1 | diff2 | blob | history
src/common/config.h diff1 | diff2 | blob | history
src/global/global_init.cc diff1 | diff2 | blob | history
src/libcephfs.cc diff1 | diff2 | blob | history
src/librados/librados.cc diff1 | diff2 | blob | history
src/log/Log.cc diff1 | diff2 | blob | history
src/log/Log.h diff1 | diff2 | blob | history
src/test/librados_test_stub/LibradosTestStub.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.