From: Guilhem Lettron Date: Wed, 9 Apr 2014 08:34:01 +0000 (+0200) Subject: Merge branch 'skip-cephx-if-disabled2' into master X-Git-Tag: v0.8.0~47 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f9f3bcb415dea81bf2d3301ca6c9190926fd124;p=ceph-cookbooks.git Merge branch 'skip-cephx-if-disabled2' into master --- 4f9f3bcb415dea81bf2d3301ca6c9190926fd124