couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r817280 - in /couchdb/branches/0.10.x: etc/default/couchdb test/etap/081-config-override.1.ini test/etap/081-config-override.2.ini
Date Mon, 21 Sep 2009 15:03:23 GMT
Author: davisp
Date: Mon Sep 21 15:03:23 2009
New Revision: 817280

URL: http://svn.apache.org/viewvc?rev=817280&view=rev
Log:
Backport the config ini license headers.


Modified:
    couchdb/branches/0.10.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.10.x/test/etap/081-config-override.1.ini
    couchdb/branches/0.10.x/test/etap/081-config-override.2.ini

Propchange: couchdb/branches/0.10.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 15:03:23 2009
@@ -3,5 +3,5 @@
 /couchdb/branches/form/etc/default/couchdb:729440-730015
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
-/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921
+/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817277
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.10.x/test/etap/081-config-override.1.ini
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/081-config-override.1.ini?rev=817280&r1=817279&r2=817280&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/081-config-override.1.ini (original)
+++ couchdb/branches/0.10.x/test/etap/081-config-override.1.ini Mon Sep 21 15:03:23 2009
@@ -1,3 +1,20 @@
+; 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.
+
 [couchdb]
 max_dbs_open=10
 

Modified: couchdb/branches/0.10.x/test/etap/081-config-override.2.ini
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/081-config-override.2.ini?rev=817280&r1=817279&r2=817280&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/081-config-override.2.ini (original)
+++ couchdb/branches/0.10.x/test/etap/081-config-override.2.ini Mon Sep 21 15:03:23 2009
@@ -1,3 +1,20 @@
+; 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.
+
 [httpd]
 port = 80
 



Mime
View raw message