From: Sage Weil <sage@redhat.com>
Date: Tue, 7 Oct 2014 19:40:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/giant'
X-Git-Tag: v0.88~101
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1036e9827c190a7eb8455a913e1e59bd356da2a7;p=ceph.git

Merge remote-tracking branch 'gh/giant'

Conflicts:
	src/osdc/Objecter.cc
---

1036e9827c190a7eb8455a913e1e59bd356da2a7