]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65ed99b 047f58d)
Merge branch 'wip-java-cephfs'
authorNoah Watkins <noahwatkins@gmail.com>
Fri, 26 Oct 2012 21:37:25 +0000 (14:37 -0700)
committerNoah Watkins <noahwatkins@gmail.com>
Fri, 26 Oct 2012 21:38:34 +0000 (14:38 -0700)
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Joe Buck <joe.buck@inktank.com>

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