]> 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: 395c446 0adb33d)
Merge branch 'master' of github.com:ceph/ceph into wip-2543
authorcaleb miles <caleb.miles@inktank.com>
Thu, 14 Jun 2012 19:59:40 +0000 (12:59 -0700)
committercaleb miles <caleb.miles@inktank.com>
Thu, 14 Jun 2012 19:59:40 +0000 (12:59 -0700)

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