]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efce39e 02d3c11)
Merge branch 'next' of https://github.com/ceph/ceph into next
authorJohn Wilkins <john.wilkins@inktank.com>
Tue, 16 Apr 2013 20:29:15 +0000 (13:29 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Tue, 16 Apr 2013 20:29:15 +0000 (13:29 -0700)

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