This is an automated email from the ASF dual-hosted git repository. anatole pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git
commit 75cfa3bdf158a23a45ea2012bda5414087994188 Merge: 0179bb5 224c714 Author: Anatole Tresch <[email protected]> AuthorDate: Sun Feb 24 18:26:16 2019 +0100 Merged latest updates. .../main/java/org/apache/tamaya/ext/examples/injection/Example.java | 2 +- .../org/apache/tamaya/ext/examples/injection/ExampleTemplate.java | 2 +- .../main/java/org/apache/tamaya/springexample/WelcomeController.java | 2 +- .../src/test/java/org/apache/tamaya/inject/TamayaInjectionTest.java | 2 +- .../src/test/java/org/apache/tamaya/osgi/injection/Example.java | 4 ++-- .../test/java/org/apache/tamaya/osgi/injection/TemplateExample.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-)
