couch commit: updated refs/heads/windsor-merge to 5e14be6

[rn...@apache.org]

Repository: couchdb-couch
Updated Branches:
  refs/heads/windsor-merge c9b4da2ab -> 5e14be68b


squash! Move attachment code into couch_att


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

Branch: refs/heads/windsor-merge
Commit: 5e14be68b20247d699d2631096e85b7eea8ab9ff
Parents: c9b4da2
Author: Robert Newson <rn...@apache.org>
Authored: Fri Aug 8 11:15:10 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Aug 8 11:15:10 2014 +0100

----------------------------------------------------------------------
 src/couch_att.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5e14be68/src/couch_att.erl
----------------------------------------------------------------------
diff --git a/src/couch_att.erl b/src/couch_att.erl
index 2775b1b..e011402 100644
--- a/src/couch_att.erl
+++ b/src/couch_att.erl
@@ -74,7 +74,7 @@
     md5 = <<>> :: binary(),
     revpos = 0 :: non_neg_integer(),
     data :: stub | follows | binary() | {any(), any()} |
-            {follows, pid()} | fun(() -> binary()),
+            {follows, pid(), reference()} | fun(() -> binary()),
 
     %% Encoding of the attachment
     %% currently supported values are:
@@ -130,7 +130,7 @@
 %% to allow simpler handling.
 -type data_prop() :: {
     data, stub | follows | binary() | {any(), any()} |
-    {follows, pid()} | fun(() -> binary())
+    {follows, pid(), reference()} | fun(() -> binary())
 }.
 
 
@@ -247,7 +247,7 @@ merge_stubs(MemAtts, DiskAtts) ->
     merge_stubs(MemAtts, OnDisk, []).
 
 
--spec merge_stubs([att()], dict(), [att()]) -> [att()].
+-spec merge_stubs([att()], dict:dict(), [att()]) -> [att()].
 merge_stubs([Att | Rest], OnDisk, Merged) ->
     case fetch(data, Att) of
         stub ->