]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Wed, 12 Nov 2014 00:22:40 +0000 (16:22 -0800)
committerSage Weil <sage@redhat.com>
Wed, 12 Nov 2014 00:22:40 +0000 (16:22 -0800)
1  2 
configure.ac
qa/workunits/cephtool/test.sh

diff --cc configure.ac
Simple merge
Simple merge