]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-10270' into master
authorJosh Durgin <jdurgin@redhat.com>
Tue, 6 Jan 2015 23:23:21 +0000 (15:23 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 6 Jan 2015 23:24:14 +0000 (15:24 -0800)
commit6fd348fe43399a882906646004bf3f5a4cf9dabb
treeca2c0c289430c7c8043f8fad6447b86a8ca5f6b8
parent1a13d92b34eb96dbe023349e9efc8876aa4c6901
parent53929ba1751fad9c9cd8545c4cd6985982d2eb5f
Merge remote-tracking branch 'origin/wip-10270' into master

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librados/IoCtxImpl.cc
src/librados/IoCtxImpl.h
src/include/rados/librados.h
src/include/rados/librados.hpp
src/librados/IoCtxImpl.cc
src/librados/IoCtxImpl.h
src/librados/RadosClient.cc
src/librados/RadosClient.h
src/librados/librados.cc
src/librbd/internal.cc
src/tracing/librados.tp