]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Wed, 13 Mar 2013 22:39:01 +0000 (15:39 -0700)
committerSage Weil <sage@inktank.com>
Wed, 13 Mar 2013 22:39:01 +0000 (15:39 -0700)
commitcb7cb4a8d62e18505b915aaab44a00fe2b7f2ba9
tree29dd3627846389cf5eca2c32c7fa4ffc57bf3708
parent7710ee23d79e2d4747face970a6ce0bf46e81ba9
parent4637752db6f8520abba160b4817323379c4a7fe0
Merge branch 'next'
src/mon/Paxos.cc
src/rgw/rgw_http_client.cc