Ryan Ernst 2521e567f1 Merge branch 'master' into jigsaw ... Original commit: elastic/x-pack-elasticsearch@c7534cfcf0		2015-12-04 11:39:33 -08:00
..
java/org/elasticsearch/smoketest	Moved shield, watcher, marvel and license plugin into common x-pack	2015-12-03 16:24:40 +01:00
resources/rest-api-spec/test/smoke_test_plugins_ssl	Merge branch 'master' into jigsaw	2015-12-04 11:39:33 -08:00