This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
commit a749b0a5c0f723ff66e4ed988b22d5c4246857b2
Merge: 94a964d d3c40d7
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Sep 12 16:16:54 2019 -0400
Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-configuration
src/changes/changes.xml | 3 +
.../configuration2/PropertiesConfiguration.java | 40 ++++++----
.../PropertiesConfigurationLayout.java | 8 +-
.../TestPropertiesConfiguration.java | 88 ++++++++++++++++++++--
.../TestPropertiesConfigurationLayout.java | 6 +-
.../include-cyclical-back-to-root.properties | 16 ++++
.../resources/include-cyclical-root.properties | 16 ++++
.../resources/include-cyclical-step.properties | 16 ++++
.../include-include-cyclical-reference.properties | 16 ++++
9 files changed, 186 insertions(+), 23 deletions(-)
