OpenSearch/elasticsearch/x-pack/license-plugin
Jason Tedor cd0f17c372 Merge branch 'master' into log4j2
* master:
  Changes tests to conform with new cluster health API, calling setWaitForNoRelocatingShards(true) instead of setWaitForRelocatingShards(0)

Original commit: elastic/x-pack-elasticsearch@bde6ad8c8a
2016-08-31 16:17:28 -04:00
..
keys Moved shield, watcher, marvel and license plugin into common x-pack 2015-12-03 16:24:40 +01:00
src Merge branch 'master' into log4j2 2016-08-31 16:17:28 -04:00
.gitignore Moved shield, watcher, marvel and license plugin into common x-pack 2015-12-03 16:24:40 +01:00