]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/jewel' 6763/head
authorJosh Durgin <jdurgin@redhat.com>
Thu, 24 Dec 2015 00:32:00 +0000 (16:32 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 24 Dec 2015 00:32:00 +0000 (16:32 -0800)
commitc485d29a53f6a2c1a3b561c54632dbac1c4e9473
treead2aa051c175173d7c57b5854082bdd2f19d727c
parentf8c4d04ce484d0234c2b9e0ec07569a9591dd15f
parenta297608196b6acbc1f7a0fe5db7d079ecdd179f3
Merge remote-tracking branch 'origin/jewel'
src/librbd/ImageCtx.cc
src/librbd/internal.cc
src/librbd/operation/SnapshotRemoveRequest.cc