You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/08/17 04:28:23 UTC
[1/2] couch commit: updated refs/heads/windsor-merge to d39cb15
Repository: couchdb-couch
Updated Branches:
refs/heads/windsor-merge a651e1dd4 -> d39cb154b
Remove upgrade code that was re-introduced during the merge
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/be7da227
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/be7da227
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/be7da227
Branch: refs/heads/windsor-merge
Commit: be7da2278ae04288e6a38abd0ca634776df934f6
Parents: a651e1d
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sat Aug 16 21:27:21 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sat Aug 16 21:27:21 2014 -0500
----------------------------------------------------------------------
src/couch_att.erl | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/be7da227/src/couch_att.erl
----------------------------------------------------------------------
diff --git a/src/couch_att.erl b/src/couch_att.erl
index f0d2dd1..232bb60 100644
--- a/src/couch_att.erl
+++ b/src/couch_att.erl
@@ -579,10 +579,6 @@ foldl(Att, Fun, Acc) ->
foldl(Bin, _Att, Fun, Acc) when is_binary(Bin) ->
Fun(Bin, Acc);
-foldl({Fd, Sp}, Att, Fun, Acc) when is_tuple(Sp) orelse Sp == null ->
- % 09 UPGRADE CODE
- Len = fetch(att_len, Att),
- couch_stream:old_foldl(Fd, Sp, Len, Fun, Acc);
foldl({Fd, Sp}, Att, Fun, Acc) ->
Md5 = fetch(md5, Att),
couch_stream:foldl(Fd, Sp, Md5, Fun, Acc);
[2/2] couch commit: updated refs/heads/windsor-merge to d39cb15
Posted by da...@apache.org.
Remove debug logging
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/d39cb154
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/d39cb154
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/d39cb154
Branch: refs/heads/windsor-merge
Commit: d39cb154bd5c7776bbd8b6d36a3ea66968b5ff41
Parents: be7da22
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sat Aug 16 21:27:54 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sat Aug 16 21:27:54 2014 -0500
----------------------------------------------------------------------
src/couch_compaction_daemon.erl | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d39cb154/src/couch_compaction_daemon.erl
----------------------------------------------------------------------
diff --git a/src/couch_compaction_daemon.erl b/src/couch_compaction_daemon.erl
index 3251d5f..53145b7 100644
--- a/src/couch_compaction_daemon.erl
+++ b/src/couch_compaction_daemon.erl
@@ -142,8 +142,6 @@ compact_loop(Parent) ->
maybe_compact_db(DbName, Config) ->
- etap:diag("~n~n~n~n################~nCOMPACTING: ~p~n#############~n~n",
- [DbName]),
case (catch couch_db:open_int(DbName, [{user_ctx, #user_ctx{roles=[<<"_admin">>]}}])) of
{ok, Db} ->
DDocNames = db_ddoc_names(Db),