]> 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: d563434 c1bf7db)
Merge branch 'master' of https://github.com/ceph/ceph into wip-doc-radosgw
authorJohn Wilkins <john.wilkins@inktank.com>
Mon, 28 Apr 2014 17:33:47 +0000 (10:33 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Mon, 28 Apr 2014 17:33:47 +0000 (10:33 -0700)

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