From: Sage Weil <sage@redhat.com>
Date: Wed, 27 Aug 2014 00:33:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.86~206
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a0c10f0efebe980a8769cc94a97e65cfada86de;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	src/os/CollectionIndex.h
---

0a0c10f0efebe980a8769cc94a97e65cfada86de