]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ef4019 98b8bc5)
Merge remote-tracking branch 'origin/nautilus-saved' into nautilus
authorSage Weil <sage@newdream.net>
Fri, 14 May 2021 14:15:48 +0000 (10:15 -0400)
committerSage Weil <sage@newdream.net>
Fri, 14 May 2021 14:15:48 +0000 (10:15 -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.