]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/testing' into next
authorSage Weil <sage@inktank.com>
Tue, 18 Dec 2012 00:51:20 +0000 (16:51 -0800)
committerSage Weil <sage@inktank.com>
Tue, 18 Dec 2012 00:51:20 +0000 (16:51 -0800)
1  2 
configure.ac

diff --cc configure.ac
Simple merge