]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68b662b 10a5e19)
Merge branch 'luminous' into ses5
authorNathan Cutler <ncutler@suse.com>
Tue, 29 Aug 2017 13:36:33 +0000 (15:36 +0200)
committerNathan Cutler <ncutler@suse.com>
Tue, 29 Aug 2017 13:36:33 +0000 (15:36 +0200)
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.