You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ii...@apache.org on 2016/05/25 12:52:28 UTC
[1/3] couch-mrview commit: updated refs/heads/master to d07771a
Repository: couchdb-couch-mrview
Updated Branches:
refs/heads/master e36509b2d -> d07771ac4
Fix match of a result from couch_mrview_util:get_view
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/9bafdca7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/9bafdca7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/9bafdca7
Branch: refs/heads/master
Commit: 9bafdca7006f97924ecd68b9fdc87f5b3564d159
Parents: e36509b
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue May 24 18:33:29 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue May 24 18:33:29 2016 -0700
----------------------------------------------------------------------
src/couch_mrview.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/9bafdca7/src/couch_mrview.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl
index 3d06a1e..20eb4be 100644
--- a/src/couch_mrview.erl
+++ b/src/couch_mrview.erl
@@ -297,8 +297,8 @@ count_view_changes_since(Db, DDoc, VName, SinceSeq) ->
count_view_changes_since(Db, DDoc, VName, SinceSeq, Options) ->
Args0 = make_view_changes_args(Options),
- {ok, {_, View}, _, Args} = couch_mrview_util:get_view(Db, DDoc, VName,
- Args0),
+ {ok, {_Type, View, _Ref}, _, Args} = couch_mrview_util:get_view(
+ Db, DDoc, VName, Args0),
case View#mrview.seq_indexed of
true ->
OptList = make_view_changes_opts(SinceSeq, Options, Args),
[2/3] couch-mrview commit: updated refs/heads/master to d07771a
Posted by ii...@apache.org.
gen_event: handle_call suppose to return `{ok, Reply, State}`
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/1a179cbc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/1a179cbc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/1a179cbc
Branch: refs/heads/master
Commit: 1a179cbca8a6654bde61826cbfc69f7eb0a23a0d
Parents: 9bafdca
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue May 24 18:34:25 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue May 24 18:34:25 2016 -0700
----------------------------------------------------------------------
src/couch_mrview_update_notifier.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/1a179cbc/src/couch_mrview_update_notifier.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_update_notifier.erl b/src/couch_mrview_update_notifier.erl
index 7c7ff1b..803d397 100644
--- a/src/couch_mrview_update_notifier.erl
+++ b/src/couch_mrview_update_notifier.erl
@@ -39,7 +39,7 @@ handle_event(Event, Fun) ->
{ok, Fun}.
handle_call(_Request, State) ->
- {reply, ok, State}.
+ {ok, ok, State}.
handle_info({'EXIT', Pid, Reason}, Pid) ->
couch_log:error("View update notification process ~p died: ~p", [Pid, Reason]),
[3/3] couch-mrview commit: updated refs/heads/master to d07771a
Posted by ii...@apache.org.
Merge remote branch 'cloudant:fix-some-type-errors'
This closes #46
Signed-off-by: ILYA Khlopotov <ii...@ca.ibm.com>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/d07771ac
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/d07771ac
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/d07771ac
Branch: refs/heads/master
Commit: d07771ac4255d3b217a993e807f1e9620b38dbee
Parents: e36509b 1a179cb
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Wed May 25 05:52:09 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed May 25 05:52:09 2016 -0700
----------------------------------------------------------------------
src/couch_mrview.erl | 4 ++--
src/couch_mrview_update_notifier.erl | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------