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 2015/01/05 21:02:34 UTC
[2/3] incubator-tamaya git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Conflicts:
core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/a830f38f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/a830f38f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/a830f38f
Branch: refs/heads/master
Commit: a830f38f722ec29e51efea8bcefe85449b519a56
Parents: b9331a7 853047a
Author: anatole <an...@apache.org>
Authored: Mon Jan 5 20:58:07 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Mon Jan 5 20:58:07 2015 +0100
----------------------------------------------------------------------
.../internal/DefaultConfigurationContext.java | 100 ++++++++++---------
1 file changed, 54 insertions(+), 46 deletions(-)
----------------------------------------------------------------------