]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a08942 79d599c)
Merge branch 'wip-java-api'
authorNoah Watkins <noahwatkins@gmail.com>
Mon, 28 Jan 2013 20:52:25 +0000 (12:52 -0800)
committerNoah Watkins <noahwatkins@gmail.com>
Mon, 28 Jan 2013 20:52:39 +0000 (12:52 -0800)
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Sage Weil <sage@inktank.com>

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