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/b90a4bb5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/b90a4bb5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/b90a4bb5 Branch: refs/heads/master Commit: b90a4bb5abcfee632d563554b3bc2a2e94b58d51 Parents: ce61cf1 a44a2ab Author: anatole <anat...@apache.org> Authored: Sun Mar 19 18:18:25 2017 +0100 Committer: anatole <anat...@apache.org> Committed: Sun Mar 19 18:18:25 2017 +0100 ---------------------------------------------------------------------- .../tamaya/functions/CombinedConfiguration.java | 33 +- .../functions/CombinedConfigurationTest.java | 337 ++++++++++++++++++- .../tamaya/functions/MethodNotMockedAnswer.java | 38 +++ 3 files changed, 390 insertions(+), 18 deletions(-) ----------------------------------------------------------------------