]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/master' into wip-journal-aio-rebased
authorSage Weil <sage.weil@dreamhost.com>
Fri, 10 Feb 2012 00:40:37 +0000 (16:40 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 10 Feb 2012 00:40:37 +0000 (16:40 -0800)
1  2 
src/Makefile.am
src/common/config_opts.h

diff --cc src/Makefile.am
Simple merge
Simple merge