]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit4e7f6b4088d8fa9bea980ad15debfaccd9491b91
tree11e564367aa5929056f950f3c528cd1cc2dc4ed4
parente6b0f2ab0aee973307a4ea07041cef7dfe3f69ab
parent3a781f9577dac407f0f57275dc8df5a0141ac5c5
Merge PR #29744 into master

* 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>