]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d78850b a27e596)
Merge PR #25673 into master
authorSage Weil <sage@redhat.com>
Thu, 3 Jan 2019 13:23:57 +0000 (07:23 -0600)
committerSage Weil <sage@redhat.com>
Thu, 3 Jan 2019 13:23:57 +0000 (07:23 -0600)
* refs/pull/25673/head:
mon/Monitor: quorum_age in JSON output as int, not string

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/Monitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.