Merge branch 'master' into log4j2

* master: Correct path.conf for integ-test-zip distribution
2016-08-31 22:34:47 -04:00 · 2016-08-31 22:34:47 -04:00 · c98e790772
parent 76ab02e002 7c47325dc7
commit c98e790772
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': [