]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15091 from ceph/luminous
authorSage Weil <sage@newdream.net>
Mon, 15 May 2017 17:47:42 +0000 (12:47 -0500)
committerGitHub <noreply@github.com>
Mon, 15 May 2017 17:47:42 +0000 (12:47 -0500)
merge v12.0.2 release tag

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge