]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c7eeab 3ee7d41)
Merge PR #31141 into master
authorSage Weil <sage@redhat.com>
Fri, 25 Oct 2019 19:30:33 +0000 (14:30 -0500)
committerSage Weil <sage@redhat.com>
Fri, 25 Oct 2019 19:30:33 +0000 (14:30 -0500)
commit0bc2ed6191b89a34973b0874440388f7162fc3f4
treeab395e29683892d7544d35306eae1dbed4e6532etree | snapshot
parent8c7eeab7032b312af35e4deec392f2f097852c08commit | diff
parent3ee7d4154ba8c15e33891e099422bbc1e64d2a93commit | diff
Merge PR #31141 into master

* refs/pull/31141/head:
ceph-daemon: fix warning message
ceph-daemon: fix enable with conflicting ceph.target files
test_ceph_daemon.sh: use same fsid as qa/standalone/test_ceph_daemon.sh
test_ceph_daemon.sh: use other latest-master image
ceph-daemon: fix pathify (fix shell --config/--keyring)
ceph-daemon: /var/run/ceph -> /var/run/ceph/$fsid

Reviewed-by: Sebastian Wagner <swagner@suse.com>
src/ceph-daemon diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.