[2/5] incubator-tamaya git commit: TAMAYA-8: Added some javadocs. TAMAYA-30: Added Codecs TAMAYA 31: Reduced number of annotations TAMAYA 34: Added Config overrides.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c9e62e24/api/src/test/java/org/apache/tamaya/TestConfigServiceSingletonSpi.java -- diff --git a/api/src/test/java/org/apache/tamaya/TestConfigServiceSingletonSpi.java

incubator-tamaya git commit: Fixed merge issues.

Repository: incubator-tamaya Updated Branches: refs/heads/master c8c513565 - be0e7eee5 Fixed merge issues. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/be0e7eee Tree:

Jenkins build is back to normal : Tamaya-Master-branch #63

See https://builds.apache.org/job/Tamaya-Master-branch/63/changes