]> 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, 24 Jun 2013 19:25:58 +0000 (12:25 -0700)
committerSage Weil <sage@inktank.com>
Mon, 24 Jun 2013 19:25:58 +0000 (12:25 -0700)
commit8cc36895e28819ac7076bb87b44ac0d341ba5add
treed0911514295be4c1e5c5f2e6f11682c07bb551d0
parent134d08a9654f66634b893d493e4a92f38acc63cf
parentf046dab88fcfeda23391bcd694abc65ff1ed8cd8
Merge remote-tracking branch 'gh/next'
src/mon/AuthMonitor.cc
src/mon/AuthMonitor.h
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h