Merge branch 'master' into eui/16.0.0

elastic · Nov 19, 2019 · 1985a0e · 1985a0e
2 parents ba6f102 + 1d6eef1
commit 1985a0e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/kbn-es/src/custom_snapshots.js b/packages/kbn-es/src/custom_snapshots.js
@@ -24,10 +24,9 @@ function isVersionFlag(a) {
 }
 
 function getCustomSnapshotUrl() {
- // force use of manually created snapshots until live ones are available
+ // force use of manually created snapshots until ReindexPutMappings fix
  if (!process.env.KBN_ES_SNAPSHOT_URL && !process.argv.some(isVersionFlag)) {
- // return 'https://storage.googleapis.com/kibana-ci-tmp-artifacts/{name}-{version}-{os}-x86_64.{ext}';
- return;
+ return 'https://storage.googleapis.com/kibana-ci-tmp-artifacts/{name}-{version}-{os}-x86_64.{ext}';
  }
 
  if (process.env.KBN_ES_SNAPSHOT_URL && process.env.KBN_ES_SNAPSHOT_URL !== 'false') {