Ryan Ernst 1583f81047 Test: Allow merging mock secure settings (#25387) ... While real secure settings (ie an ES keystore) cannot be merged together, mocked secure settings can and need to be sometimes merged. This commit adds a merge method to allow tests to merge together multiple instances of secure settings.		2017-06-25 10:19:51 -07:00
..
fixtures	Remove assemble from build task when assemble removed	2017-06-16 17:19:14 -04:00
framework	Test: Allow merging mock secure settings (#25387)	2017-06-25 10:19:51 -07:00
logger-usage	Upgrade checkstyle to version 7.5	2017-02-03 09:46:44 -05:00
build.gradle	Add authentication to reindex-from-remote	2016-07-27 14:17:41 -04:00