]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-hadoop-docs'
authorNoah Watkins <noahwatkins@gmail.com>
Fri, 15 Feb 2013 16:55:28 +0000 (08:55 -0800)
committerNoah Watkins <noahwatkins@gmail.com>
Fri, 15 Feb 2013 16:55:33 +0000 (08:55 -0800)
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

Trivial merge