]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2721 from wyllys66/wip-8942
authorSage Weil <sage@redhat.com>
Tue, 14 Oct 2014 21:49:43 +0000 (14:49 -0700)
committerSage Weil <sage@redhat.com>
Tue, 14 Oct 2014 21:49:43 +0000 (14:49 -0700)
librados: osd: Fixed JSON output for stray OSDs

Backport: giant, firefly
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSDMap.cc

Simple merge