]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2266876 0c78a03)
Merge branch 'master' of github.com:ceph/ceph
authorJohn Wilkins <john.wilkins@inktank.com>
Wed, 5 Sep 2012 00:17:07 +0000 (17:17 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Wed, 5 Sep 2012 00:17:07 +0000 (17:17 -0700)

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