From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Feb 2020 22:45:01 +0000 (-0600)
Subject: Merge PR #33352 into master
X-Git-Tag: v15.1.1~358
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=347797ff133ea46353be279fc8f7c62daa663e1f;p=ceph-ci.git

Merge PR #33352 into master

* refs/pull/33352/head:
	ceph.in: catch KeyboardInterrupt from outer code
	ceph.in: fix second exception on ^C

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

347797ff133ea46353be279fc8f7c62daa663e1f