]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'origin/master' into wip-pool-sharing
authorGreg Farnum <gregory.farnum@dreamhost.com>
Mon, 26 Sep 2011 20:18:15 +0000 (13:18 -0700)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Mon, 26 Sep 2011 20:18:15 +0000 (13:18 -0700)
1  2 
src/Makefile.am
src/librados.cc

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