]> 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: 9bfb1f6 3263b90)
Merge pull request #21211 from tchaikov/wip-clang-without-map-merge
authorKefu Chai <tchaikov@gmail.com>
Sat, 7 Apr 2018 09:29:15 +0000 (17:29 +0800)
committerGitHub <noreply@github.com>
Sat, 7 Apr 2018 09:29:15 +0000 (17:29 +0800)
cmake,mds: detect std::map::merge() before using it.

Reviewed-by: Zheng Yan <zyan@redhat.com>

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