couchdb commit: updated refs/heads/2.0.x to ef3c678

[wohali]

Repository: couchdb
Updated Branches:
  refs/heads/2.0.x 66120aca4 -> ef3c678d4


Remove version suffix from Windows build


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

Branch: refs/heads/2.0.x
Commit: ef3c678d4e133d6ba0d266c864130f2416c260ba
Parents: 66120ac
Author: Joan Touzet 
Authored: Mon Sep 12 15:59:42 2016 -0400
Committer: Joan Touzet 
Committed: Mon Sep 12 15:59:42 2016 -0400

--
 Makefile.win | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ef3c678d/Makefile.win
--
diff --git a/Makefile.win b/Makefile.win
index 168b2ff..1c2b05f 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -19,7 +19,7 @@ COUCHDB_VERSION_SUFFIX = -$(shell git rev-parse --short 
--verify HEAD)
 else
 COUCHDB_VERSION_SUFFIX = 
 endif
-COUCHDB_VERSION = 
$(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX)
+COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)
 
 DESTDIR=
 

couchdb commit: updated refs/heads/2.0.x to 66120ac

[wohali]

Repository: couchdb
Updated Branches:
  refs/heads/2.0.x cb02b9b81 -> 66120aca4


bump couch ver for Windows version fix


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

Branch: refs/heads/2.0.x
Commit: 66120aca43e3cd40ee91f4de0b7cc0b32169dee8
Parents: cb02b9b
Author: Joan Touzet 
Authored: Mon Sep 12 15:56:12 2016 -0400
Committer: Joan Touzet 
Committed: Mon Sep 12 15:58:43 2016 -0400

--
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/66120aca/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 6224dc3..1639d01 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -29,7 +29,7 @@ DepDescs = [
 {b64url,   "b64url",   
"6895652d80f95cdf04efb14625abed868998f174"},
 {couch_log,"couch-log",
"ad803f66dbd1900b67543259142875a6d03503ce"},
 {chttpd,   "chttpd",   
"2c1f3a3167b4b667ec8cbc5a5079911a17630753"},
-{couch,"couch",
"7d0cfb5f9d1f0fcdc607b46f31ae33cbf65115df"},
+{couch,"couch",
"a468b0db6f1a9795b32e26c34b340df4d51f31b0"},
 {couch_index,  "couch-index",  
"53555fd909d5dd3d4a610c3fd6795950a8f7d022"},
 {couch_mrview, "couch-mrview", 
"a0b0392afe66ece9ef3bb4fdd5a4f159c97c47eb"},
 {couch_replicator, "couch-replicator", 
"b9232c8d410d529d65030896e075c4b4327631b0"},

couchdb commit: updated refs/heads/master to 9add02f

[wohali]

Repository: couchdb
Updated Branches:
  refs/heads/master 966fd3be9 -> 9add02fa8


bump couch ver for Windows version fix


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

Branch: refs/heads/master
Commit: 9add02fa84056e6c442736ea1c0117e35b41e87b
Parents: 966fd3b
Author: Joan Touzet 
Authored: Mon Sep 12 15:56:12 2016 -0400
Committer: Joan Touzet 
Committed: Mon Sep 12 15:56:12 2016 -0400

--
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9add02fa/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 4019da2..1639d01 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -29,7 +29,7 @@ DepDescs = [
 {b64url,   "b64url",   
"6895652d80f95cdf04efb14625abed868998f174"},
 {couch_log,"couch-log",
"ad803f66dbd1900b67543259142875a6d03503ce"},
 {chttpd,   "chttpd",   
"2c1f3a3167b4b667ec8cbc5a5079911a17630753"},
-{couch,"couch",
"3fed6863af49358925a8b3a0df1cfa1f4bdb242b"},
+{couch,"couch",
"a468b0db6f1a9795b32e26c34b340df4d51f31b0"},
 {couch_index,  "couch-index",  
"53555fd909d5dd3d4a610c3fd6795950a8f7d022"},
 {couch_mrview, "couch-mrview", 
"a0b0392afe66ece9ef3bb4fdd5a4f159c97c47eb"},
 {couch_replicator, "couch-replicator", 
"b9232c8d410d529d65030896e075c4b4327631b0"},

[1/2] couch commit: updated refs/heads/master to a468b0d

[wohali]

Repository: couchdb-couch
Updated Branches:
  refs/heads/master 7d0cfb5f9 -> a468b0db6


Fix Windows version string determination

For some reason, the COUCHD_VERSION string on Windows is getting
suffixed whitespace. We fix this by string:strip(Version0, right) on the
variable before use.


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

Branch: refs/heads/master
Commit: 70b61f08618c34f4604bebc2ad2b8d71f90cca5e
Parents: 7d0cfb5
Author: Joan Touzet 
Authored: Mon Sep 12 15:28:31 2016 -0400
Committer: Joan Touzet 
Committed: Mon Sep 12 15:28:31 2016 -0400

--
 rebar.config.script  | 2 +-
 src/couch.app.src.script | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/70b61f08/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 7d803b9..8e4ea13 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -36,7 +36,7 @@ Version = case os:getenv("COUCHDB_VERSION") of
 false ->
 string:strip(os:cmd("git describe --always"), right, $\n);
 Version0 ->
-Version0
+string:strip(Version0, right)
 end,
 
 CouchConfig = case filelib:is_file(os:getenv("COUCHDB_CONFIG")) of

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/70b61f08/src/couch.app.src.script
--
diff --git a/src/couch.app.src.script b/src/couch.app.src.script
index 40d922e..60a9345 100644
--- a/src/couch.app.src.script
+++ b/src/couch.app.src.script
@@ -15,7 +15,7 @@ Version = case os:getenv("COUCHDB_VERSION") of
 false ->
 string:strip(os:cmd("git describe --always"), right, $\n);
 Version0 ->
-Version0
+string:strip(Version0, right)
 end,
 
 

[2/2] couch commit: updated refs/heads/master to a468b0d

[wohali]

Merge branch 'fix-windows-version' of https://github.com/wohali/couchdb-couch


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

Branch: refs/heads/master
Commit: a468b0db6f1a9795b32e26c34b340df4d51f31b0
Parents: 7d0cfb5 70b61f0
Author: Joan Touzet 
Authored: Mon Sep 12 15:52:51 2016 -0400
Committer: Joan Touzet 
Committed: Mon Sep 12 15:52:51 2016 -0400

--
 rebar.config.script  | 2 +-
 src/couch.app.src.script | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

couchdb commit: updated refs/heads/2.0.x to cb02b9b

[rnewson]

Repository: couchdb
Updated Branches:
  refs/heads/2.0.x 1693128fb -> cb02b9b81


get version from environment in cross-platform way


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

Branch: refs/heads/2.0.x
Commit: cb02b9b812174609403d67f60c314959388ba06c
Parents: 1693128
Author: Robert Newson 
Authored: Mon Sep 12 10:29:35 2016 +0100
Committer: Robert Newson 
Committed: Mon Sep 12 10:34:26 2016 +0100

--
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb02b9b8/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 6c6f7fb..6224dc3 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -29,7 +29,7 @@ DepDescs = [
 {b64url,   "b64url",   
"6895652d80f95cdf04efb14625abed868998f174"},
 {couch_log,"couch-log",
"ad803f66dbd1900b67543259142875a6d03503ce"},
 {chttpd,   "chttpd",   
"2c1f3a3167b4b667ec8cbc5a5079911a17630753"},
-{couch,"couch",
"c613dabf635ca3a5d6de2240d00b80c334dc8f43"},
+{couch,"couch",
"7d0cfb5f9d1f0fcdc607b46f31ae33cbf65115df"},
 {couch_index,  "couch-index",  
"53555fd909d5dd3d4a610c3fd6795950a8f7d022"},
 {couch_mrview, "couch-mrview", 
"a0b0392afe66ece9ef3bb4fdd5a4f159c97c47eb"},
 {couch_replicator, "couch-replicator", 
"b9232c8d410d529d65030896e075c4b4327631b0"},

couch commit: updated refs/heads/master to 7d0cfb5

[rnewson]

Repository: couchdb-couch
Updated Branches:
  refs/heads/master c613dabf6 -> 7d0cfb5f9


get version from environment in cross-platform way


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

Branch: refs/heads/master
Commit: 7d0cfb5f9d1f0fcdc607b46f31ae33cbf65115df
Parents: c613dab
Author: Robert Newson 
Authored: Mon Sep 12 10:28:51 2016 +0100
Committer: Robert Newson 
Committed: Mon Sep 12 10:28:51 2016 +0100

--
 src/couch.app.src| 52 
 src/couch.app.src.script | 61 +++
 2 files changed, 61 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/7d0cfb5f/src/couch.app.src
--
diff --git a/src/couch.app.src b/src/couch.app.src
deleted file mode 100644
index d30f106..000
--- a/src/couch.app.src
+++ /dev/null
@@ -1,52 +0,0 @@
-% Licensed under the Apache License, Version 2.0 (the "License"); you may not
-% use this file except in compliance with the License. You may obtain a copy of
-% the License at
-%
-%   http://www.apache.org/licenses/LICENSE-2.0
-%
-% Unless required by applicable law or agreed to in writing, software
-% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-% License for the specific language governing permissions and limitations under
-% the License.
-
-{application, couch, [
-{description, "Apache CouchDB"},
-{vsn, {cmd, "echo $COUCHDB_VERSION"}},
-{registered, [
-couch_db_update,
-couch_db_update_notifier_sup,
-couch_external_manager,
-couch_httpd,
-couch_primary_services,
-couch_proc_manager,
-couch_secondary_services,
-couch_server,
-couch_sup,
-couch_task_status
-]},
-{mod, {couch_app, []}},
-{applications, [
-% stdlib
-kernel,
-stdlib,
-crypto,
-sasl,
-inets,
-ssl,
-os_mon,
-
-% Upstream deps
-ibrowse,
-mochiweb,
-oauth,
-
-% ASF deps
-couch_epi,
-b64url,
-couch_log,
-couch_event,
-ioq,
-couch_stats
-]}
-]}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/7d0cfb5f/src/couch.app.src.script
--
diff --git a/src/couch.app.src.script b/src/couch.app.src.script
new file mode 100644
index 000..40d922e
--- /dev/null
+++ b/src/couch.app.src.script
@@ -0,0 +1,61 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+%% cut-paste from rebar.config.script. dedupe somehow later.
+Version = case os:getenv("COUCHDB_VERSION") of
+false ->
+string:strip(os:cmd("git describe --always"), right, $\n);
+Version0 ->
+Version0
+end,
+
+
+{application, couch, [
+{description, "Apache CouchDB"},
+{vsn, Version},
+{registered, [
+couch_db_update,
+couch_db_update_notifier_sup,
+couch_external_manager,
+couch_httpd,
+couch_primary_services,
+couch_proc_manager,
+couch_secondary_services,
+couch_server,
+couch_sup,
+couch_task_status
+]},
+{mod, {couch_app, []}},
+{applications, [
+% stdlib
+kernel,
+stdlib,
+crypto,
+sasl,
+inets,
+ssl,
+os_mon,
+
+% Upstream deps
+ibrowse,
+mochiweb,
+oauth,
+
+% ASF deps
+couch_epi,
+b64url,
+couch_log,
+couch_event,
+ioq,
+couch_stats
+]}
+]}.

couchdb commit: updated refs/heads/2.0.x to 1693128

[jan]

Repository: couchdb
Updated Branches:
  refs/heads/2.0.x 85c796fb3 -> 1693128fb


update to include mango fix for COUCHDB-3143


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

Branch: refs/heads/2.0.x
Commit: 1693128fb087fe876789d0c933edf29f8c60b4f3
Parents: 85c796f
Author: Jan Lehnardt 
Authored: Mon Sep 12 08:14:26 2016 +0200
Committer: Jan Lehnardt 
Committed: Mon Sep 12 08:15:07 2016 +0200

--
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1693128f/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 777fa0c..6c6f7fb 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -49,7 +49,7 @@ DepDescs = [
 {ioq,  "ioq",  
"ba99ec70d31cf82fe4868ab4bb92b0978f4fe67f"},
 {jiffy,"jiffy",
"d3c00e19d8fa20c21758402231247602190988d3"},
 {khash,"khash",
"7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
-{mango,"mango",
"1a421567886a039628e3ec66d44a515ec324d26d"},
+{mango,"mango",
"610ccb60d09bb2a730fa1af318c6ce558538d2ba"},
 {mem3, "mem3", 
"252467cb4a27637090b5f9006483f5b7ab551699"},
 {mochiweb, "mochiweb", 
"bd6ae7cbb371666a1f68115056f7b30d13765782"},
 {oauth,"oauth",
"099057a98e41f3aff91e77e3cf496d6c6fd901df"},

couchdb commit: updated refs/heads/master to 966fd3b

[jan]

Repository: couchdb
Updated Branches:
  refs/heads/master 8f1921972 -> 966fd3be9


update to include mango fix for COUCHDB-3143


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

Branch: refs/heads/master
Commit: 966fd3be90f3d058e7539dcac54a7bb03474832c
Parents: 8f19219
Author: Jan Lehnardt 
Authored: Mon Sep 12 08:14:26 2016 +0200
Committer: Jan Lehnardt 
Committed: Mon Sep 12 08:14:30 2016 +0200

--
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/966fd3be/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index d025a6d..4019da2 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -49,7 +49,7 @@ DepDescs = [
 {ioq,  "ioq",  
"ba99ec70d31cf82fe4868ab4bb92b0978f4fe67f"},
 {jiffy,"jiffy",
"d3c00e19d8fa20c21758402231247602190988d3"},
 {khash,"khash",
"7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
-{mango,"mango",
"1a421567886a039628e3ec66d44a515ec324d26d"},
+{mango,"mango",
"610ccb60d09bb2a730fa1af318c6ce558538d2ba"},
 {mem3, "mem3", 
"252467cb4a27637090b5f9006483f5b7ab551699"},
 {mochiweb, "mochiweb", 
"bd6ae7cbb371666a1f68115056f7b30d13765782"},
 {oauth,"oauth",
"099057a98e41f3aff91e77e3cf496d6c6fd901df"},

[2/3] couchdb-mango git commit: Fix test suite check for text indexes

[jan]

Fix test suite check for text indexes

This was passing by accident on travis because the $CWD is set
differently so the test would always fail. If however you tried to run
the tests locally then it would fail. Obviously the test is just wrong
since we're moving the mango_cursor_text.erl file in rebar.config, and
not mango_cursor.erl which is required for every index type.

COUCHDB-3143


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

Branch: refs/heads/master
Commit: 29b59449dffea83470ec5c828a8ab2e8c6504a65
Parents: d8432c5
Author: Paul J. Davis 
Authored: Sun Sep 11 14:08:51 2016 -0500
Committer: Paul J. Davis 
Committed: Sun Sep 11 14:08:51 2016 -0500

--
 test/mango.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/29b59449/test/mango.py
--
diff --git a/test/mango.py b/test/mango.py
index 09c45fc..da51180 100644
--- a/test/mango.py
+++ b/test/mango.py
@@ -27,7 +27,7 @@ def random_db_name():
 return "mango_test_" + uuid.uuid4().hex
 
 def has_text_service():
-return os.path.isfile(os.getcwd() + "/../src/mango_cursor.erl")
+return os.path.isfile(os.getcwd() + "/../src/mango_cursor_text.erl")
 
 
 class Database(object):

[3/3] couchdb-mango git commit: Merge remote-tracking branch 'cloudant/3143-fix-default-limit'

[jan]

Merge remote-tracking branch 'cloudant/3143-fix-default-limit'

* cloudant/3143-fix-default-limit:
  Fix test suite check for text indexes
  Set default limit to 25


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

Branch: refs/heads/master
Commit: 610ccb60d09bb2a730fa1af318c6ce558538d2ba
Parents: 1a42156 29b5944
Author: Jan Lehnardt 
Authored: Mon Sep 12 08:13:29 2016 +0200
Committer: Jan Lehnardt 
Committed: Mon Sep 12 08:13:29 2016 +0200

--
 src/mango_cursor.hrl | 2 +-
 src/mango_opts.erl   | 2 +-
 test/mango.py| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--

[1/3] couchdb-mango git commit: Set default limit to 25

[jan]

Repository: couchdb-mango
Updated Branches:
  refs/heads/master 1a4215678 -> 610ccb60d


Set default limit to 25

The docs claim the limit is 25 and this was the intention but this value
was never updated. The reason to set it at 25 is in case we add other
index types that are unable to stream results to the client (ie,
anything Lucene based). This allows us to maintain the same API across
all calls regardless of index type used.

COUCHDB-3143


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

Branch: refs/heads/master
Commit: d8432c58a004141123e13a5af6dad78e3746399d
Parents: 1a42156
Author: Paul J. Davis 
Authored: Sun Sep 11 13:38:12 2016 -0500
Committer: Paul J. Davis 
Committed: Sun Sep 11 14:07:50 2016 -0500

--
 src/mango_cursor.hrl | 2 +-
 src/mango_opts.erl   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/d8432c58/src/mango_cursor.hrl
--
diff --git a/src/mango_cursor.hrl b/src/mango_cursor.hrl
index f80c987..5706b6b 100644
--- a/src/mango_cursor.hrl
+++ b/src/mango_cursor.hrl
@@ -16,7 +16,7 @@
 ranges,
 selector,
 opts,
-limit = 100,
+limit = 25,
 skip = 0,
 fields = undefined,
 user_fun,

http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/d8432c58/src/mango_opts.erl
--
diff --git a/src/mango_opts.erl b/src/mango_opts.erl
index 0c66a21..40e3504 100644
--- a/src/mango_opts.erl
+++ b/src/mango_opts.erl
@@ -93,7 +93,7 @@ validate_find({Props}) ->
 {<<"limit">>, [
 {tag, limit},
 {optional, true},
-{default, 100},
+{default, 25},
 {validator, fun is_non_neg_integer/1}
 ]},
 {<<"skip">>, [