]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/wip_fs_omap'
authorSage Weil <sage.weil@dreamhost.com>
Fri, 2 Mar 2012 17:35:11 +0000 (09:35 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 2 Mar 2012 17:35:11 +0000 (09:35 -0800)
Reviewed-by: Sage Weil <sage.weil@dreamhost.com>
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge