]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6db5bf5 3efd4f7)
Merge PR #22583 into master
authorSage Weil <sage@redhat.com>
Fri, 15 Jun 2018 20:29:23 +0000 (15:29 -0500)
committerSage Weil <sage@redhat.com>
Fri, 15 Jun 2018 20:29:23 +0000 (15:29 -0500)
* refs/pull/22583/head:
test/objectstore/CMakefiles: fix unittest_alloc_bench build

Reviewed-by: Mark Nelson <mnelson@redhat.com>

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