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 17:39:34 UTC
[1/5] couch commit: updated refs/heads/master to 5f9cf9f
Repository: couchdb-couch
Updated Branches:
refs/heads/master be1dedb8e -> 5f9cf9f74
get_user_creds can receive nil as first arg
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/628a0f4b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/628a0f4b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/628a0f4b
Branch: refs/heads/master
Commit: 628a0f4b179703fe42191caebc2052327162267e
Parents: be1dedb
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue May 24 17:33:16 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue May 24 17:33:16 2016 -0700
----------------------------------------------------------------------
src/couch_auth_cache.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/628a0f4b/src/couch_auth_cache.erl
----------------------------------------------------------------------
diff --git a/src/couch_auth_cache.erl b/src/couch_auth_cache.erl
index 5893744..32d706d 100644
--- a/src/couch_auth_cache.erl
+++ b/src/couch_auth_cache.erl
@@ -49,7 +49,7 @@
get_user_creds(UserName) ->
get_user_creds(nil, UserName).
--spec get_user_creds(Req::#httpd{}, UserName::string() | binary()) ->
+-spec get_user_creds(Req::#httpd{} | nil, UserName::string() | binary()) ->
{ok, Credentials::list(), term()} | nil.
get_user_creds(Req, UserName) when is_list(UserName) ->
[5/5] couch commit: updated refs/heads/master to 5f9cf9f
Posted by ii...@apache.org.
Merge remote branch 'cloudant:fix-some-type-errors'
This closes #176
Signed-off-by: ILYA Khlopotov <ii...@ca.ibm.com>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/5f9cf9f7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/5f9cf9f7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/5f9cf9f7
Branch: refs/heads/master
Commit: 5f9cf9f74da4763ed93322923ccdb62dca101e80
Parents: be1dedb aa24609
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Wed May 25 10:39:15 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed May 25 10:39:15 2016 -0700
----------------------------------------------------------------------
src/couch_auth_cache.erl | 2 +-
src/couch_event_sup.erl | 2 +-
src/couch_file.erl | 2 +-
src/couch_proc_manager.erl | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/5] couch commit: updated refs/heads/master to 5f9cf9f
Posted by ii...@apache.org.
gen_server: handle_call suppose to return `{reply, Res, State}`
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/4214c4fa
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/4214c4fa
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/4214c4fa
Branch: refs/heads/master
Commit: 4214c4facecd92b8f336d1bb5d6ecbab99c49674
Parents: b65bf01
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue May 24 17:34:50 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue May 24 17:34:50 2016 -0700
----------------------------------------------------------------------
src/couch_event_sup.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/4214c4fa/src/couch_event_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_event_sup.erl b/src/couch_event_sup.erl
index 39e728c..b617498 100644
--- a/src/couch_event_sup.erl
+++ b/src/couch_event_sup.erl
@@ -62,7 +62,7 @@ terminate(_Reason, _State) ->
ok.
handle_call(_Whatever, _From, State) ->
- {ok, State}.
+ {reply, ok, State}.
handle_cast(stop, State) ->
{stop, normal, State}.
[4/5] couch commit: updated refs/heads/master to 5f9cf9f
Posted by ii...@apache.org.
couch_proc_manager:remove_proc expects #proc_int{} record
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/aa246095
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/aa246095
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/aa246095
Branch: refs/heads/master
Commit: aa2460957da99ce3b80000c9173d391b2672ac3f
Parents: 4214c4f
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue May 24 17:35:40 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed May 25 10:24:53 2016 -0700
----------------------------------------------------------------------
src/couch_proc_manager.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/aa246095/src/couch_proc_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_proc_manager.erl b/src/couch_proc_manager.erl
index b3ca69a..a6c9746 100644
--- a/src/couch_proc_manager.erl
+++ b/src/couch_proc_manager.erl
@@ -443,7 +443,7 @@ return_proc(#state{} = State, #proc_int{} = ProcInt) ->
NewState = case is_process_alive(Pid) of true ->
case ProcInt#proc_int.t0 < State#state.threshold_ts of
true ->
- remove_proc(State, Pid);
+ remove_proc(State, ProcInt);
false ->
gen_server:cast(Pid, garbage_collect),
true = ets:update_element(?PROCS, Pid, [
[2/5] couch commit: updated refs/heads/master to 5f9cf9f
Posted by ii...@apache.org.
couch_file:process_info can return `undefined`
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/b65bf015
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/b65bf015
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/b65bf015
Branch: refs/heads/master
Commit: b65bf015baf0f676a15ebb66dee16498c385a5ad
Parents: 628a0f4
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue May 24 17:33:57 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue May 24 17:33:57 2016 -0700
----------------------------------------------------------------------
src/couch_file.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/b65bf015/src/couch_file.erl
----------------------------------------------------------------------
diff --git a/src/couch_file.erl b/src/couch_file.erl
index d2b3960..8346b02 100644
--- a/src/couch_file.erl
+++ b/src/couch_file.erl
@@ -664,7 +664,7 @@ is_idle(#file{is_sys=false}) ->
end.
-spec process_info(CouchFilePid :: pid()) ->
- {Fd :: pid() | tuple(), FilePath :: string()}.
+ {Fd :: pid() | tuple(), FilePath :: string()} | undefined.
process_info(Pid) ->
{dictionary, Dict} = erlang:process_info(Pid, dictionary),