]> 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: c511894 f674f36)
Merge branch 'master' of https://github.com/ceph/ceph into wip-doc-radosgw
authorJohn Wilkins <john.wilkins@inktank.com>
Tue, 29 Apr 2014 01:07:27 +0000 (18:07 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Tue, 29 Apr 2014 01:07:27 +0000 (18:07 -0700)

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