]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Mon, 8 Sep 2014 19:19:45 +0000 (12:19 -0700)
committerSage Weil <sage@redhat.com>
Mon, 8 Sep 2014 19:19:45 +0000 (12:19 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge