Author: chtompki
Date: Wed Oct 24 01:04:42 2018
New Revision: 1844710
URL: http://svn.apache.org/viewvc?rev=1844710&view=rev
Log:
Merging trunk into 2.4
Modified:
commons/proper/configuration/branches/RELEASE_2_4_BRANCH/ (props changed)
commons/proper/configuration/branches/RELEASE_2_4_BRANCH/src/test/resources/jup-test.properties
Propchange: commons/proper/configuration/branches/RELEASE_2_4_BRANCH/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 24 01:04:42 2018
@@ -1,3 +1,4 @@
/commons/proper/configuration/branches/CONFIGURATION_390:819412-822131
/commons/proper/configuration/branches/configuration2-alpha:1624597-1624751
/commons/proper/configuration/branches/immutableNodes:1561338-1588830
+/commons/proper/configuration/trunk:1844455-1844709
Modified:
commons/proper/configuration/branches/RELEASE_2_4_BRANCH/src/test/resources/jup-test.properties
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/RELEASE_2_4_BRANCH/src/test/resources/jup-test.properties?rev=1844710&r1=1844709&r2=1844710&view=diff
==============================================================================
---
commons/proper/configuration/branches/RELEASE_2_4_BRANCH/src/test/resources/jup-test.properties
(original)
+++
commons/proper/configuration/branches/RELEASE_2_4_BRANCH/src/test/resources/jup-test.properties
Wed Oct 24 01:04:42 2018
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# A properties file to test the compatibility of
# PropertiesConfiguration.JupIOFactory to java.util.Properties (JUP).
# Test cases in here don't necessarily indicate that the DefaultIOFactory
