]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15600 from ceph/luminous
authorSage Weil <sage@newdream.net>
Fri, 9 Jun 2017 14:13:59 +0000 (09:13 -0500)
committerGitHub <noreply@github.com>
Fri, 9 Jun 2017 14:13:59 +0000 (09:13 -0500)
12.0.3

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge