From: Noah Watkins <noahwatkins@gmail.com>
Date: Mon, 28 Jan 2013 20:52:25 +0000 (-0800)
Subject: Merge branch 'wip-java-api'
X-Git-Tag: v0.57~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4edef483715c3b60ca2f2bab78e6cee20162af68;p=ceph.git

Merge branch 'wip-java-api'

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

4edef483715c3b60ca2f2bab78e6cee20162af68