couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Adam Kocoloski <kocol...@apache.org>
Subject one more for 0.10.0
Date Mon, 28 Sep 2009 00:51:03 GMT
Hi Noah, is it too late to sneak this one in?  Sorry about that.  Best,

Adam

On Sep 27, 2009, at 8:46 PM, kocolosk@apache.org wrote:

> Author: kocolosk
> Date: Mon Sep 28 00:46:14 2009
> New Revision: 819437
>
> URL: http://svn.apache.org/viewvc?rev=819437&view=rev
> Log:
> fix replication w/ 0.9 servers (merge r819436)
>
> Modified:
>    couchdb/branches/0.10.x/   (props changed)
>    couchdb/branches/0.10.x/etc/default/couchdb   (props changed)
>    couchdb/branches/0.10.x/src/couchdb/couch_rep_changes_feed.erl
>
> Propchange: couchdb/branches/0.10.x/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Sep 28 00:46:14 2009
> @@ -3,4 +3,4 @@
> /couchdb/branches/form:729440-730015
> /couchdb/branches/list-iterator:782292-784593
> /couchdb/branches/tail_header:775760-778477
> -/couchdb/trunk: 
> 806983,807208 
> -807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817278,817398,817400,817403,817749,817793,818249
> +/couchdb/trunk: 
> 806983,807208 
> -807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817278,817398,817400,817403,817749,817793,818249,819436
>
> Propchange: couchdb/branches/0.10.x/etc/default/couchdb
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Sep 28 00:46:14 2009
> @@ -3,5 +3,5 @@
> /couchdb/branches/form/etc/default/couchdb:729440-730015
> /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
> /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
> -/couchdb/trunk/etc/default/couchdb: 
> 806983,807208 
> -807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817277

> -817278,817398,817400,817403,817749,817793,818249
> +/couchdb/trunk/etc/default/couchdb: 
> 806983,807208 
> -807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817277

> -817278,817398,817400,817403,817749,817793,818249,819436
> /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
>
> Modified: couchdb/branches/0.10.x/src/couchdb/ 
> couch_rep_changes_feed.erl
> URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/couchdb/couch_rep_changes_feed.erl?rev=819437&r1=819436&r2=819437&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- couchdb/branches/0.10.x/src/couchdb/couch_rep_changes_feed.erl  
> (original)
> +++ couchdb/branches/0.10.x/src/couchdb/couch_rep_changes_feed.erl  
> Mon Sep 28 00:46:14 2009
> @@ -296,7 +296,7 @@
>         gen_server:call(Server, {add_change, Change}, infinity),
>         Seq
>     end, 0, Rows),
> -    by_seq_loop(Server, Source, EndSeq+1).
> +    by_seq_loop(Server, Source, EndSeq).
>
> decode_row(<<",\n", Rest/binary>>) ->
>     decode_row(Rest);
>
>


Mime
View raw message