From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 5 Aug 2015 01:13:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v9.1.0~438
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d11b6b9d1f48569d8fe3877d58a858b4104b5b7;p=ceph.git

Merge remote-tracking branch 'origin/next'

Conflicts:
	src/Makefile-client.am (link rbd to libglobal again)
---

7d11b6b9d1f48569d8fe3877d58a858b4104b5b7