]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/next'
authorJosh Durgin <jdurgin@redhat.com>
Mon, 6 Jul 2015 23:02:23 +0000 (16:02 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 6 Jul 2015 23:02:23 +0000 (16:02 -0700)
commit72a0185eccb8e40ef2369bc46c97df2a153976b2
treee25f6fe9b368b1e1470258dc9487c467d6a74c4d
parent06e01824d801fc684abee4f6b0753f16b64abab6
parentdea73c1dddbb8d2349ec1e972734aa6b38d59e46
Merge remote-tracking branch 'origin/next'
src/librbd/ImageCtx.cc
src/librbd/ImageCtx.h
src/librbd/internal.cc
src/rbd.cc
src/rgw/rgw_common.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rest.cc
src/test/Makefile-client.am