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

..

bin/x-pack

Remove settings and system properties entanglement

2016-05-19 14:09:49 -04:00

graph/src

Handle moving rest support

2016-08-15 22:41:43 -04:00

license-plugin

Merge branch 'master' into log4j2

2016-08-31 16:17:28 -04:00

monitoring/src

Merge branch 'master' into log4j2

2016-08-31 10:26:30 -04:00

security

Merge branch 'master' into log4j2

2016-08-31 16:17:28 -04:00

src

Remove unnecessary logging of exception message

2016-08-30 21:03:46 -04:00

watcher

Remove empty Javadocs in ExecutableSearchTransform

2016-08-30 21:05:18 -04:00

build.gradle

test: smoke-test-plugins-ssl no longer relies on logging to start

2016-08-31 08:08:41 -04:00

NOTICE.txt

security: ssl by default on the transport layer

2016-04-29 12:50:07 -04:00