]> 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: 4a21de9 262617c)
Merge remote-tracking branch 'gh/luminous'
authorSage Weil <sage@redhat.com>
Fri, 7 Jul 2017 18:19:47 +0000 (14:19 -0400)
committerSage Weil <sage@redhat.com>
Fri, 7 Jul 2017 18:19:47 +0000 (14:19 -0400)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.