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

Posted to commits@tamaya.apache.org by po...@apache.org on 2019/05/01 20:12:58 UTC

[incubator-tamaya] 02/03: Merge remote-tracking branch 'origin/master' into try_with_resource

This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch try_with_resource
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya.git

commit d9b9ac967baf04e5c00ab280942a275a7d4dd90e
Merge: d8e34ce ac49208
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Wed May 1 22:12:13 2019 +0200

    Merge remote-tracking branch 'origin/master' into try_with_resource

 .travis.yml                                                         | 4 ++++
 README.md                                                           | 2 --
 .../src/main/java/org/apache/tamaya/spi/ServiceContextManager.java  | 6 +++---
 .../org/apache/tamaya/core/propertysource/BasePropertySource.java   | 2 +-
 .../apache/tamaya/spisupport/propertysource/BasePropertySource.java | 2 +-
 .../spisupport/propertysource/PropertiesResourcePropertySource.java | 2 +-
 .../tamaya/spisupport/propertysource/SystemPropertySource.java      | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)