]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-mon-sync-2' into cuttlefish
authorSage Weil <sage@inktank.com>
Fri, 12 Jul 2013 22:21:20 +0000 (15:21 -0700)
committerSage Weil <sage@inktank.com>
Fri, 12 Jul 2013 22:21:20 +0000 (15:21 -0700)
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge