From: Sage Weil <sage@redhat.com>
Date: Tue, 5 May 2015 23:32:35 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v10.2.6~165^2^2~482
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1bfedda6d73a8ee7dd27202f87baab19f50b869f;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	suites/fs/recovery/tasks/client-limits.yaml
	suites/fs/recovery/tasks/mds-full.yaml
	tasks/ceph_deploy.py
---

1bfedda6d73a8ee7dd27202f87baab19f50b869f