]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0e0a385 abf3dc0)
Merge PR #31781 into master
authorSage Weil <sage@redhat.com>
Tue, 26 Nov 2019 03:49:31 +0000 (21:49 -0600)
committerSage Weil <sage@redhat.com>
Tue, 26 Nov 2019 03:49:31 +0000 (21:49 -0600)
commitcf676c73aba1fc8d70a3408f113f1340f4b39b49
tree0132afabea4b9bb36108fc179bc871aa3f024c05tree | snapshot
parent0e0a3853c9e6906a786809845d0379859266732ccommit | diff
parentabf3dc0cf9ae92538bb69f403f8c2622b9d5c674commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.