]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
1  2 
src/mon/Paxos.cc
src/rgw/rgw_http_client.cc

Simple merge
Simple merge