Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/ce61cf16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/ce61cf16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/ce61cf16 Branch: refs/heads/master Commit: ce61cf16e9d1872ada8345e7cb060a6cb3db5aa0 Parents: b3bcddc ebc9941 Author: anatole <anat...@apache.org> Authored: Sun Mar 19 00:22:30 2017 +0100 Committer: anatole <anat...@apache.org> Committed: Sun Mar 19 00:22:30 2017 +0100 ---------------------------------------------------------------------- modules/functions/pom.xml | 5 ++ .../tamaya/functions/CombinedConfiguration.java | 7 ++- .../tamaya/functions/MappedConfiguration.java | 3 + .../functions/CombinedConfigurationTest.java | 50 ++++++++++++----- .../tamaya/functions/InMemoryConfiguration.java | 35 ++++++++++++ .../functions/MappedConfigurationTest.java | 58 ++++++++++++++++++++ pom.xml | 17 ++++++ running-mutation-tests.adoc | 19 +++++++ 8 files changed, 180 insertions(+), 14 deletions(-) ----------------------------------------------------------------------