]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Wed, 10 Jun 2015 17:14:46 +0000 (13:14 -0400)
committerSage Weil <sage@redhat.com>
Wed, 10 Jun 2015 17:14:46 +0000 (13:14 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge