]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
1  2 
src/common/config_opts.h
src/mon/Paxos.cc

Simple merge
Simple merge