From: Noah Watkins <noahwatkins@gmail.com>
Date: Sun, 14 Jul 2013 23:32:28 +0000 (-0700)
Subject: Merge branch 'wip-hadoop-doc'
X-Git-Tag: v0.67-rc1~81
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d277edd24ab09fbe3bbda85d4ad7abf69625705f;p=ceph.git

Merge branch 'wip-hadoop-doc'

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

d277edd24ab09fbe3bbda85d4ad7abf69625705f