Merge branch 'master' into deprecate

2016-08-31 19:03:23 -07:00 · 2016-08-31 19:03:23 -07:00 · 2e25085e23
parent 1cdfc3ccfe 7c47325dc7
commit 2e25085e23
1 changed files with 1 additions and 0 deletions
--- a/distribution/build.gradle
+++ b/distribution/build.gradle
@ -490,6 +490,7 @@ Map<String, String> expansionsForDistribution(distributionType) {
    'path.conf': [
      'tar': '$ES_HOME/config',
      'zip': '$ES_HOME/config',
+      'integ-test-zip': '$ES_HOME/config',
      'def': '/etc/elasticsearch',
    ],
    'path.env': [