You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tamaya.apache.org by an...@apache.org on 2017/03/19 22:05:44 UTC

[06/12] incubator-tamaya-extensions git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions

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 <an...@apache.org>
Authored: Sun Mar 19 18:18:25 2017 +0100
Committer: anatole <an...@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(-)
----------------------------------------------------------------------