]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.