]> 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: fe164e4 d4732e8)
Merge branch 'master' of https://github.com/ceph/ceph
authorJohn Wilkins <john.wilkins@inktank.com>
Thu, 9 May 2013 19:09:00 +0000 (12:09 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Thu, 9 May 2013 19:09:00 +0000 (12:09 -0700)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.