Lee Hinman 320ec6716d Merge branch 'master' into enhancement/use_shard_bulk_for_single_ops ... Original commit: elastic/x-pack-elasticsearch@23761f3e16		2017-01-09 16:27:42 -07:00
..
bin/x-pack	Build: Reorganize src roots	2016-10-01 09:46:43 +02:00
config/x-pack	Build: Reorganize src roots	2016-10-01 09:46:43 +02:00
keys	Collapsed license code into xpack src	2016-09-29 12:22:19 +02:00
src	Merge branch 'master' into enhancement/use_shard_bulk_for_single_ops	2017-01-09 16:27:42 -07:00
NOTICE.txt	Moved directories around	2016-09-29 12:03:14 +02:00
build.gradle	Replace com.sun.net.httpserver.Http/Https server usages with MockHttpServer. (elastic/elasticsearch#4476)	2017-01-05 11:29:31 -06:00