From: Sage Weil <sage@redhat.com>
Date: Sat, 26 Jul 2014 04:42:35 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.84~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2088c267d6578d8b2e0a0220d23c9fea3d558706;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	src/osdc/Journaler.h
---

2088c267d6578d8b2e0a0220d23c9fea3d558706