]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/stable' into next
authorSage Weil <sage.weil@dreamhost.com>
Mon, 9 Apr 2012 03:59:33 +0000 (20:59 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Mon, 9 Apr 2012 03:59:33 +0000 (20:59 -0700)
1  2 
configure.ac
src/os/FileStore.cc

diff --cc configure.ac
Simple merge
Simple merge