]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Mon, 11 Mar 2013 23:57:00 +0000 (16:57 -0700)
committerSage Weil <sage@inktank.com>
Mon, 11 Mar 2013 23:57:00 +0000 (16:57 -0700)
commitf2a877ad0d182f3d2d8fd969abf1faeef40dd9a7
treef7fc6b0ec7a0e02d303b58bcee7db40f78490edc
parentc021c5ccf0c063cccd7314964420405cea6406de
parent2450db1b92f28424d0c048927036168881923096
Merge remote-tracking branch 'gh/next'
src/common/config_opts.h
src/mon/Paxos.cc