From: Samuel Just <sjust@redhat.com>
Date: Wed, 21 Sep 2016 16:21:41 +0000 (-0700)
Subject: Merge pull request #1179 from ceph/wip-16688-master
X-Git-Tag: v11.1.1~58^2^2~94
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a3d139726c9f7c904ad6d293dd196dfea4a24012;p=ceph.git

Merge pull request #1179 from ceph/wip-16688-master

Removed 11429 config

Reviewed-by: Samuel Just <sjust@redhat.com>
---

a3d139726c9f7c904ad6d293dd196dfea4a24012