]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-java-test'
authorSam Lang <sam.lang@inktank.com>
Fri, 9 Nov 2012 19:52:07 +0000 (13:52 -0600)
committerSam Lang <sam.lang@inktank.com>
Fri, 9 Nov 2012 19:52:07 +0000 (13:52 -0600)

Trivial merge