]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 750f162 4a90e64)
Merge remote-tracking branch 'origin/master'
authorPatrick McGarry <pmcgarry@redhat.com>
Mon, 1 Aug 2016 19:59:08 +0000 (15:59 -0400)
committerPatrick McGarry <pmcgarry@redhat.com>
Mon, 1 Aug 2016 19:59:08 +0000 (15:59 -0400)
1  2 
doc/conf.py patch | diff1 | diff2 | blob | history

diff --cc doc/conf.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.