]> 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: fc18cca 8ade74b)
Merge branch 'master' of github.com:ceph/ceph
authorJohn Wilkins <john.wilkins@inktank.com>
Tue, 3 Jul 2012 18:48:31 +0000 (11:48 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Tue, 3 Jul 2012 18:48:31 +0000 (11:48 -0700)

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