11 Commits

Author	SHA1	Message	Date
Ryan Ernst	b6ce09a361	Switch messy watcher+groovy tests to messy-test plugin ... Original commit: elastic/x-pack-elasticsearch@8163f0f129	2015-12-08 19:52:22 -08:00
Ryan Ernst	4bbd4c25b0	Enable security manager for messy groovy tests ... Original commit: elastic/x-pack-elasticsearch@4b2b256a04	2015-12-08 17:26:53 -08:00
jaymode	68e3c0a08e	test: disable marvel for watcher with groovy tests ... This commit disables marvel when running the watcher with groovy tests. Marvel creates indices and expect the cluster to be green, which won't happen with the marvel indices existing and expecting a replica. See elastic/elasticsearch#1087 Original commit: elastic/x-pack-elasticsearch@8d163a53b7	2015-12-07 06:39:33 -05:00
Robert Muir	f3fd72c9d0	Use Date instead of System in groovy script... its absurd to expect scripts can use System ... Original commit: elastic/x-pack-elasticsearch@9b32e621c7	2015-12-05 22:13:50 -05:00
Ryan Ernst	3e9d29d9b9	Update plugins smoke test to use correct plugin count for xpack ... Original commit: elastic/x-pack-elasticsearch@40f464acbd	2015-12-04 11:52:31 -08:00
Ryan Ernst	2521e567f1	Merge branch 'master' into jigsaw ... Original commit: elastic/x-pack-elasticsearch@c7534cfcf0	2015-12-04 11:39:33 -08:00
jaymode	a039acf578	more fixes for the combined plugin ... * move static initialization hack for UnboundID Debug to XPackPlugin * cleanup bundlePlugin calls in build file * properly disable watcher and marvel for shield core tests Original commit: elastic/x-pack-elasticsearch@2b89cf2225	2015-12-03 14:56:12 -05:00
jaymode	9b2dd0c11d	fixes after rebase ... Original commit: elastic/x-pack-elasticsearch@6896b88829	2015-12-03 16:24:40 +01: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