From: Simon Pasquier Date: Thu, 24 Nov 2016 16:09:12 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' into stacklight X-Git-Tag: 2016.12~5^2~1^2 X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=c69012544408e0e43c1e26db22bcc5cfe168d5a1 Merge remote-tracking branch 'upstream/master' into stacklight --- c69012544408e0e43c1e26db22bcc5cfe168d5a1