[couchdb] branch master updated (8506afc -> de0634f)

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tonysun83 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    from 8506afc  Revert "Revert "Use Ejson Body Instead of Compressed Body for External size (#606)""
     add 6d06dcf  calculate data_size correctly
     new de0634f  Merge branch '3430-external-size-views'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/couch/test/couchdb_file_compression_tests.erl | 14 ++++++-
 src/couch_mrview/src/couch_mrview_util.erl        | 47 +++++++++++++++++------
 2 files changed, 49 insertions(+), 12 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb] 01/01: Merge branch '3430-external-size-views'

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tonysun83 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit de0634f7abc06b59deea9e1fe3495de2b3c8d2af
Merge: 8506afc 6d06dcf
Author: Tony Sun <to...@cloudant.com>
AuthorDate: Sat Jul 15 11:23:00 2017 -0700

    Merge branch '3430-external-size-views'

 src/couch/test/couchdb_file_compression_tests.erl | 14 ++++++-
 src/couch_mrview/src/couch_mrview_util.erl        | 47 +++++++++++++++++------
 2 files changed, 49 insertions(+), 12 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.