Jason Tedor 76ab02e002 Merge branch 'master' into log4j2 ... * master: Avoid NPE in LoggingListener Randomly use Netty 3 plugin in some tests Skip smoke test client on JDK 9 Revert "Don't allow XContentBuilder#writeValue(TimeValue)" [docs] Remove coming in 2.0.0 Don't allow XContentBuilder#writeValue(TimeValue) [doc] Remove leftover from CONSOLE conversion Parameter improvements to Cluster Health API wait for shards (#20223) Add 2.4.0 to packaging tests list Docs: clarify scale is applied at origin+offest (#20242)		2016-08-31 16:37:55 -04:00
..
src/test/java/org/elasticsearch/smoketest	Merge branch 'master' into log4j2	2016-08-31 16:37:55 -04:00
build.gradle	Add a dedicated client/transport project for transport-client (#19435)	2016-07-18 15:42:24 +02:00