From: Sage Weil <sage@redhat.com>
Date: Tue, 26 Nov 2019 03:49:31 +0000 (-0600)
Subject: Merge PR #31781 into master
X-Git-Tag: v15.1.0~754
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf676c73aba1fc8d70a3408f113f1340f4b39b49;p=ceph.git

Merge PR #31781 into master

* refs/pull/31781/head:
	cmake/modules: look for GNU make first instead of BSD make
	cmake: support parallel build for rocksdb

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

cf676c73aba1fc8d70a3408f113f1340f4b39b49