diff options
| author | Ryan Ernst <ryan@iernst.net> | 2017-06-25 10:19:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-25 10:19:51 -0700 |
| commit | 1583f8104725eca4779a0a0fd9886839c4c615a3 (patch) | |
| tree | 18c605e977ffa5e45b46d1e03e0589fc5507a3aa /test/framework/src/main/resources | |
| parent | 4e4a104f4aaed2dc5166a9b2b1b61fc48945b823 (diff) | |
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.
Diffstat (limited to 'test/framework/src/main/resources')
0 files changed, 0 insertions, 0 deletions