]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/master' into wip-pool-sharing
authorGreg Farnum <gregory.farnum@dreamhost.com>
Tue, 27 Sep 2011 15:28:02 +0000 (08:28 -0700)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Tue, 27 Sep 2011 15:28:02 +0000 (08:28 -0700)
commitd36462813540abbc8e3ba22602134eb051aa0767
tree4f6bd295fca81f8620ed8c96bd693d2f7b1e3b7b
parentc780494d8d5f0f0f3ad372a07227b631879cf2a9
parent9045b3f5a5f9c96f84208e7406d0dfb292502fe2
Merge remote branch 'origin/master' into wip-pool-sharing

Conflicts:
src/osd/OSD.cc
src/rgw/rgw_rados.cc
src/Makefile.am
src/librados.cc
src/rgw/rgw_admin.cc
src/rgw/rgw_rados.cc