couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject couchdb commit: updated refs/heads/master to 5b95ae0
Date Thu, 01 Oct 2015 17:48:48 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master e9ba41121 -> 5b95ae0fc


Revert "Merge branch 'reduce-log-noise-for-eunit'"

This reverts commit 57171e781c5cd0579ee81040ee47199affb79e84, reversing
changes made to 11b4fcd98bbebfea0eef4f5c18ecd2163bae2941.


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

Branch: refs/heads/master
Commit: 5b95ae0fcfd79dfb2b334fad59bb10642c7aceb9
Parents: e9ba411
Author: Alexander Shorin <kxepal@apache.org>
Authored: Thu Oct 1 20:47:02 2015 +0300
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Thu Oct 1 20:47:02 2015 +0300

----------------------------------------------------------------------
 Makefile               |  1 -
 rel/files/eunit.config | 16 ----------------
 2 files changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5b95ae0f/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index e3162b6..a56ff32 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,6 @@ docker-stop:
 	@docker stop `cat .docker-id`
 
 eunit: export BUILDDIR = $(shell pwd)
-eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit
 eunit: couch
 	@${REBAR} setup_eunit
 	@${REBAR} -r eunit skip_deps=meck,mochiweb,lager,snappy,folsom

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5b95ae0f/rel/files/eunit.config
----------------------------------------------------------------------
diff --git a/rel/files/eunit.config b/rel/files/eunit.config
deleted file mode 100644
index c785643..0000000
--- a/rel/files/eunit.config
+++ /dev/null
@@ -1,16 +0,0 @@
-% Licensed 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.
-
-[
-    {kernel, [{error_logger, silent}]},
-    {sasl, [{sasl_error_logger, false}]}
-].
\ No newline at end of file


Mime
View raw message