tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [5/5] incubator-tamaya git commit: Fixed merge issue.
Date Sat, 20 Dec 2014 14:31:10 GMT
Fixed merge issue.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/c8c51356
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/c8c51356
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/c8c51356

Branch: refs/heads/master
Commit: c8c513565f4df5e92ef1474b61ef105ab739b17f
Parents: f8c9103
Author: anatole <anatole@apache.org>
Authored: Sat Dec 20 15:30:50 2014 +0100
Committer: anatole <anatole@apache.org>
Committed: Sat Dec 20 15:30:50 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/tamaya/core/config/MappedConfiguration.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c8c51356/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java b/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java
index 5833e2c..e668b91 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java
@@ -51,8 +51,8 @@ class MappedConfiguration extends AbstractConfiguration implements Configuration
     }
 
     @Override
-    public void apply(ConfigChangeSet change) {
-        this.config.apply(change);
+    public void applyChanges(ConfigChangeSet change) {
+        this.config.applyChanges(change);
     }
 
     @Override


Mime
View raw message