]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/mon-auth'
authorSage Weil <sage@inktank.com>
Thu, 7 Jun 2012 19:22:47 +0000 (12:22 -0700)
committerSage Weil <sage@inktank.com>
Thu, 7 Jun 2012 19:22:47 +0000 (12:22 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/mon/Monitor.cc

Simple merge