]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-java-enotdir'
authorNoah Watkins <noahwatkins@gmail.com>
Wed, 21 Nov 2012 20:33:43 +0000 (12:33 -0800)
committerNoah Watkins <noahwatkins@gmail.com>
Wed, 21 Nov 2012 20:34:03 +0000 (12:34 -0800)
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Joe Buck <jbbuck@gmail.com>

Trivial merge