]> 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: b5ec1c6 a74a4ac)
Merge branch 'master' of http://github.com/ceph/ceph
authorGary Lowell <gary.lowell@inktank.com>
Tue, 4 Dec 2012 05:31:14 +0000 (21:31 -0800)
committerGary Lowell <gary.lowell@inktank.com>
Tue, 4 Dec 2012 05:31:14 +0000 (21:31 -0800)

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