git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

projects / ceph-ci.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4898dc8 8a65b2a)

author	Sage Weil <sage@redhat.com>
	Thu, 29 Nov 2018 20:25:19 +0000 (14:25 -0600)
committer	Sage Weil <sage@redhat.com>
	Thu, 29 Nov 2018 20:25:19 +0000 (14:25 -0600)
commit	706c5d59f2c04a0640b641d1cdc941f5b3e2cc3e
tree	1e338231862f822b1a178f0015da01e63ff56e1f	tree \| snapshot
parent	4898dc811a5222d2c3b13c4d6f1f2b845d5e995c	commit \| diff
parent	8a65b2a76d6c9f13a9d2ca2d68361686f0306696	commit \| diff

Merge PR #25303 into master

* refs/pull/25303/head:
mgr/DaemonState: fix get_config_defaults locking

Reviewed-by: Sage Weil <sage@redhat.com>

src/mgr/DaemonServer.cc

Unnamed repository; edit this file 'description' to name the repository.