]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7979 from dillaman/wip-14413
authorJosh Durgin <jdurgin@redhat.com>
Tue, 15 Mar 2016 00:14:01 +0000 (17:14 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 15 Mar 2016 00:14:01 +0000 (17:14 -0700)
rbd-mirror: remote to local cluster image sync

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/librbd/ImageWatcher.cc
src/test/Makefile-client.am
src/tools/Makefile-client.am

Simple merge
Simple merge
Simple merge