]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1222 from dachary/wip-pending-osdmap
authorLoic Dachary <loic@dachary.org>
Thu, 13 Feb 2014 09:16:40 +0000 (10:16 +0100)
committerLoic Dachary <loic@dachary.org>
Thu, 13 Feb 2014 09:16:40 +0000 (10:16 +0100)
mon: control pending OSDMap for testing

Reviewed-by: Joao Eduardo Luis <joao@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge