]> 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: e6b0f2a 3a781f9)
Merge PR #29744 into master
authorSage Weil <sage@redhat.com>
Wed, 21 Aug 2019 20:02:27 +0000 (15:02 -0500)
committerSage Weil <sage@redhat.com>
Wed, 21 Aug 2019 20:02:27 +0000 (15:02 -0500)
* refs/pull/29744/head:
qa/run-standalone.sh: fix python path
qa/standalone/mon/health-mute.sh: fix up rachet test
qa/standalone/mon/health-mute.sh: s/kill daemons/kill_daemons/

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

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