couchdb commit: updated refs/heads/master to 9c23a06

[rn...@apache.org]

Repository: couchdb
Updated Branches:
  refs/heads/master d411a9a42 -> 9c23a065d


Don't include eunit.ini into release

COUCHDB-2684


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9c23a065
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9c23a065
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9c23a065

Branch: refs/heads/master
Commit: 9c23a065dd30577aed887b2e371a23e9557d4fcb
Parents: d411a9a
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Mon May 11 05:49:35 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Mon May 11 05:49:35 2015 -0700

----------------------------------------------------------------------
 rel/files/README          |  2 ++
 rel/files/eunit.ini       | 28 ++++++++++++++++++++++++++++
 rel/overlay/etc/eunit.ini | 28 ----------------------------
 setup_eunit.template      |  2 +-
 4 files changed, 31 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c23a065/rel/files/README
----------------------------------------------------------------------
diff --git a/rel/files/README b/rel/files/README
index e96c111..d22e2f0 100644
--- a/rel/files/README
+++ b/rel/files/README
@@ -14,3 +14,5 @@ Ignore these files for now.
 
 This is to pacify newer rebar that insists on having a sys.config and
 a vm.args in releases/$VSN/.
+
+eunit.ini is only for local testing so it is not copied into release

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c23a065/rel/files/eunit.ini
----------------------------------------------------------------------
diff --git a/rel/files/eunit.ini b/rel/files/eunit.ini
new file mode 100644
index 0000000..50024a3
--- /dev/null
+++ b/rel/files/eunit.ini
@@ -0,0 +1,28 @@
+; 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]
+; time to relax!
+uuid = 74696d6520746f2072656c617821
+
+[httpd]
+port = 0
+
+[log]
+; logging is disabled to remove unwanted noise in stdout from tests processing
+level = none
+include_sasl = false

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c23a065/rel/overlay/etc/eunit.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/eunit.ini b/rel/overlay/etc/eunit.ini
deleted file mode 100644
index 50024a3..0000000
--- a/rel/overlay/etc/eunit.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-; 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]
-; time to relax!
-uuid = 74696d6520746f2072656c617821
-
-[httpd]
-port = 0
-
-[log]
-; logging is disabled to remove unwanted noise in stdout from tests processing
-level = none
-include_sasl = false

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c23a065/setup_eunit.template
----------------------------------------------------------------------
diff --git a/setup_eunit.template b/setup_eunit.template
index 1365970..97bee46 100644
--- a/setup_eunit.template
+++ b/setup_eunit.template
@@ -14,5 +14,5 @@
 {dir, "tmp/tmp_data"}.
 {template, "rel/overlay/etc/default.ini", "tmp/etc/default_eunit.ini"}.
 {template, "rel/overlay/etc/local.ini", "tmp/etc/local_eunit.ini"}.
-{template, "rel/overlay/etc/eunit.ini", "tmp/etc/eunit.ini"}.
+{template, "rel/files/eunit.ini", "tmp/etc/eunit.ini"}.
 {template, "rel/overlay/etc/vm.args", "tmp/etc/vm.args"}.