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/19 12:05:21 UTC

[1/2] fabric commit: updated refs/heads/master to d20eafd

Repository: couchdb-fabric
Updated Branches:
  refs/heads/master 087a1aa9e -> d20eafda9


Fix return type in get_all_security


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

Branch: refs/heads/master
Commit: dbbdb17ce9241826cd95e655ea8d8d11466c4119
Parents: 087a1aa
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Wed May 18 16:39:09 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed May 18 16:39:09 2016 -0700

----------------------------------------------------------------------
 src/fabric.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/dbbdb17c/src/fabric.erl
----------------------------------------------------------------------
diff --git a/src/fabric.erl b/src/fabric.erl
index e568179..7e1223b 100644
--- a/src/fabric.erl
+++ b/src/fabric.erl
@@ -147,7 +147,7 @@ get_security(DbName, Options) ->
 
 %% @doc retrieve the security object for all shards of a database
 -spec get_all_security(dbname()) ->
-    {ok, json_obj()} |
+    {ok, [{#shard{}, json_obj()}]} |
     {error, no_majority | timeout} |
     {error, atom(), any()}.
 get_all_security(DbName) ->
@@ -155,7 +155,7 @@ get_all_security(DbName) ->
 
 %% @doc retrieve the security object for all shards of a database
 -spec get_all_security(dbname(), [option()]) ->
-    {ok, json_obj()} |
+    {ok, [{#shard{}, json_obj()}]} |
     {error, no_majority | timeout} |
     {error, atom(), any()}.
 get_all_security(DbName, Options) ->


[2/2] fabric commit: updated refs/heads/master to d20eafd

Posted by ii...@apache.org.
Merge remote branch 'cloudant:fix-spec-for-get_all_security'

This closes #51

Signed-off-by: ILYA Khlopotov <ii...@ca.ibm.com>


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

Branch: refs/heads/master
Commit: d20eafda9045c523f773fbbd06a81d354e1a6ba7
Parents: 087a1aa dbbdb17
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Thu May 19 05:04:59 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Thu May 19 05:04:59 2016 -0700

----------------------------------------------------------------------
 src/fabric.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------