]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit50687a29719c403cce6daae9b435f25c66aee730
treee2d061c39b6dd7cd203618718593161191a93788tree | snapshot
parentd78850bb56bfe2ead2699dfd5a4508c137a88b07commit | diff
parenta27e596493c0838c67c725fc5c9a3ab4f718534acommit | diff
Merge PR #25673 into master

* refs/pull/25673/head:
mon/Monitor: quorum_age in JSON output as int, not string

Reviewed-by: Kefu Chai <kchai@redhat.com>
src/mon/Monitor.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.