]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6957ae7 78c844e)
Merge branch 'master' of github.com:ceph/ceph
authorJohn Wilkins <john.wilkins@inktank.com>
Thu, 6 Sep 2012 00:26:39 +0000 (17:26 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Thu, 6 Sep 2012 00:26:39 +0000 (17:26 -0700)
1  2 
doc/control.rst patch | diff1 | diff2 | blob | history

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