OpenSearch

Author	SHA1	Message	Date
Ryan Ernst	2521e567f1	Merge branch 'master' into jigsaw Original commit: elastic/x-pack-elasticsearch@c7534cfcf0	2015-12-04 11:39:33 -08:00
jaymode	628febf3f7	fix integration tests after reorganization This commit fixes the integration tests and qa test after the reorganization to be packaged as a single plugin. Original commit: elastic/x-pack-elasticsearch@d6f488627f	2015-12-03 16:24:40 +01:00
Ryan Ernst	7ef87632ab	Moved shield, watcher, marvel and license plugin into common x-pack project, and combined their gradle builds. Everything builds, but many many tests fail. Original commit: elastic/x-pack-elasticsearch@d18d4614aa	2015-12-03 16:24:40 +01:00
jaymode	e5b0e7f5cb	reorganize directory layout See elastic/elasticsearch#1022 Original commit: elastic/x-pack-elasticsearch@3ee8761312	2015-12-03 16:22:37 +01:00