]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d233271 ccfd841)
Merge branch 'master' of github.com:ceph/ceph
authorJohn Wilkins <john.wilkins@inktank.com>
Tue, 4 Sep 2012 23:17:46 +0000 (16:17 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Tue, 4 Sep 2012 23:17:46 +0000 (16:17 -0700)

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