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

..

licenses

Upgrade to lucene-7.0.0-snapshot-ad2cb77. (#25349)

2017-06-22 12:35:33 +02:00

src

Test: Allow merging mock secure settings (#25387)

2017-06-25 10:19:51 -07:00

build.gradle

Mark Log4j API dependency as non-optional

2017-06-08 16:09:34 -04:00