git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8a40b37 12649ef)

author	Sage Weil <sage@redhat.com>
	Fri, 29 Jan 2016 13:28:30 +0000 (08:28 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 29 Jan 2016 13:28:30 +0000 (08:28 -0500)
commit	71501a3ab4e67830a9f0e7338f5e8b1b4b8d06b1
tree	704945fc9f1813dbd4ffa22c349343e0d4773fe7	tree \| snapshot
parent	8a40b37a9e668e72473975d1d800e28905a94a4f	commit \| diff
parent	12649ef49bc5ac71ece57c929b9466e94d05a15e	commit \| diff

Merge pull request #7075 from shun-s/shun-fix

global: do not start two daemons with a single pid-file

Reviewed-by: Kefu Chai <kchai@redhat.com>

src/test/Makefile.am

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