Merge PR #33352 into master
authorSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 22:45:01 +0000 (16:45 -0600)
committerSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 22:45:01 +0000 (16:45 -0600)
* 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>

Trivial merge