]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Tue, 5 May 2015 16:53:51 +0000 (09:53 -0700)
committerSage Weil <sage@redhat.com>
Tue, 5 May 2015 16:53:51 +0000 (09:53 -0700)
1  2 
Makefile.am
configure.ac
src/librbd/ImageWatcher.cc

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
Simple merge