[1/4] git commit: updated refs/heads/1.3.x to 1421a22

2013-05-28 Thread randall 
Updated Branches:
  refs/heads/1.3.x 7720cecb2 - 1421a2246
  refs/heads/master b1c87da66 - 3357462ad


[couchjs] make stack size option effective

The previous way this was coded changes the chunk size that is used
whenever the stack grows but does not change the maximum memory
allowed by the runtime.

Closes COUCHDB-1792


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

Branch: refs/heads/1.3.x
Commit: cfaa66cd6f5590bc317cf063112bb27e23ee06d8
Parents: 7720cec
Author: Randall Leeds rand...@apache.org
Authored: Tue May 14 17:34:40 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Tue May 28 00:41:13 2013 -0700

--
 src/couchdb/priv/couch_js/help.h  |4 ++--
 src/couchdb/priv/couch_js/sm170.c |6 +++---
 src/couchdb/priv/couch_js/sm180.c |6 +++---
 src/couchdb/priv/couch_js/sm185.c |4 ++--
 src/couchdb/priv/couch_js/util.c  |2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/help.h
--
diff --git a/src/couchdb/priv/couch_js/help.h b/src/couchdb/priv/couch_js/help.h
index b31bb8c..f4ddb24 100644
--- a/src/couchdb/priv/couch_js/help.h
+++ b/src/couchdb/priv/couch_js/help.h
@@ -48,8 +48,8 @@ static const char USAGE_TEMPLATE[] =
   -V  display version information and exit\n
   -H  enable %s cURL bindings (only avaiable\n
   if package was built with cURL available)\n
-  -S SIZE specify that the interpreter should set the\n
-  stack quota for JS contexts to SIZE bytes\n
+  -S SIZE specify that the runtime should allow at\n
+  most SIZE bytes of memory to be allocated\n
   -u FILE path to a .uri file containing the address\n
   (or addresses) of one or more servers\n
 \n

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm170.c
--
diff --git a/src/couchdb/priv/couch_js/sm170.c 
b/src/couchdb/priv/couch_js/sm170.c
index 4a18d8f..51e4f4d 100644
--- a/src/couchdb/priv/couch_js/sm170.c
+++ b/src/couchdb/priv/couch_js/sm170.c
@@ -313,12 +313,12 @@ main(int argc, const char* argv[])
 int i;
 
 couch_args* args = couch_parse_args(argc, argv);
-
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm180.c
--
diff --git a/src/couchdb/priv/couch_js/sm180.c 
b/src/couchdb/priv/couch_js/sm180.c
index 9ffd1df..5fb8ce0 100644
--- a/src/couchdb/priv/couch_js/sm180.c
+++ b/src/couchdb/priv/couch_js/sm180.c
@@ -322,12 +322,12 @@ main(int argc, const char* argv[])
 int i;
 
 couch_args* args = couch_parse_args(argc, argv);
-
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm185.c
--
diff --git a/src/couchdb/priv/couch_js/sm185.c 
b/src/couchdb/priv/couch_js/sm185.c
index bfee023..c378d4a 100644
--- a/src/couchdb/priv/couch_js/sm185.c
+++ b/src/couchdb/priv/couch_js/sm185.c
@@ -335,11 +335,11 @@ main(int argc, const char* argv[])
 
 couch_args* args = couch_parse_args(argc, argv);
 
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/util.c
--
diff --git a/src/couchdb/priv/couch_js/util.c b/src/couchdb/priv/couch_js/util.c
index 5c88402..b4700de 100644
--- a/src/couchdb/priv/couch_js/util.c
+++ b/src/couchdb/priv/couch_js/util.c
@@ -77,7 +77,7 @@ couch_parse_args(int argc, const char* argv[])
 return NULL;
 
 memset(args, '\0', sizeof(couch_args));
-

[4/4] git commit: updated refs/heads/master to 3357462

2013-05-28 Thread randall 
Update NEWS and CHANGES w 1.3.1 entries


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

Branch: refs/heads/master
Commit: 3357462ad3841afbd0df90f606f9bc915439fd30
Parents: b1c87da
Author: Randall Leeds rand...@apache.org
Authored: Tue May 28 00:46:56 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Tue May 28 00:53:18 2013 -0700

--
 CHANGES |   19 +++
 NEWS|6 ++
 2 files changed, 25 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/3357462a/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 5d5e52b..578efaa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,25 @@ Apache CouchDB CHANGES
 #
 # This version has not been released yet.
 
+# Replicator:
+
+#  * Tolerate missing source and target fields in _replicator docs
+  (COUCHDB-1788).
+
+# Log System:
+
+#  * Don't log about missing .compact files.
+#  * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+
+# View Server:
+
+#  * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
+
+# Misc:
+
+#  * Improve documentation: better structure, improve language, less 
duplication.
+#  * Improvements to test suite.
+
 Version 1.3.0
 -
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/3357462a/NEWS
--
diff --git a/NEWS b/NEWS
index 6ed3f20..efa79aa 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,12 @@ Each release section notes when backwards incompatible 
changes have been made.
 #
 # This version has not been released yet.
 
+#  * Tolerate missing source and target fields in _replicator docs.
+#  * Don't log about missing .compact files.
+#  * Fix bug in WARN level logging from 1.3.0.
+#  * Improve documentation: better structure, improve language, less 
duplication.
+#  * Improvements to test suite.
+
 Version 1.3.0
 -

[2/4] git commit: updated refs/heads/1.3.x to 1421a22

2013-05-28 Thread randall 
Update CHANGES with bug numbers and add 1792


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

Branch: refs/heads/1.3.x
Commit: 62cc707e5121a947643f262f8103cc01c6119430
Parents: cfaa66c
Author: Randall Leeds rand...@apache.org
Authored: Tue May 28 00:46:56 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Tue May 28 00:46:56 2013 -0700

--
 CHANGES |9 +++--
 1 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/62cc707e/CHANGES
--
diff --git a/CHANGES b/CHANGES
index f422f89..3ecd19c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,12 +8,17 @@ This version has not been released yet.
 
 Replicator:
 
-* Tolerate missing source and target fields in _replicator docs.
+* Tolerate missing source and target fields in _replicator docs
+ (COUCHDB-1788).
 
 Log System:
 
 * Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0.
+* Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+
+View Server:
+
+* Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
 
 Misc:

[3/4] git commit: updated refs/heads/1.3.x to 1421a22

2013-05-28 Thread randall 
match indent in NEWS/CHANGES with older releases


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

Branch: refs/heads/1.3.x
Commit: 1421a224672d59c2eee1780c8cba11693e6b3abb
Parents: 62cc707
Author: Randall Leeds rand...@apache.org
Authored: Tue May 28 00:47:54 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Tue May 28 00:48:22 2013 -0700

--
 CHANGES |   14 +++---
 NEWS|   10 +-
 2 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1421a224/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 3ecd19c..8057814 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,22 +8,22 @@ This version has not been released yet.
 
 Replicator:
 
-* Tolerate missing source and target fields in _replicator docs
- (COUCHDB-1788).
+ * Tolerate missing source and target fields in _replicator docs
+  (COUCHDB-1788).
 
 Log System:
 
-* Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
 
 View Server:
 
-* Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
+ * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
 
 Misc:
 
-* Improve documentation: better structure, improve language, less duplication.
-* Improvements to test suite.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite.
 
 Version 1.3.0
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1421a224/NEWS
--
diff --git a/NEWS b/NEWS
index 4a05320..486daf0 100644
--- a/NEWS
+++ b/NEWS
@@ -10,11 +10,11 @@ Each release section notes when backwards incompatible 
changes have been made.
 Version 1.3.1
 -
 
-* Tolerate missing source and target fields in _replicator docs.
-* Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0.
-* Improve documentation: better structure, improve language, less duplication.
-* Improvements to test suite.
+ * Tolerate missing source and target fields in _replicator docs.
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite.
 
 Version 1.3.0
 -

git commit: updated refs/heads/fauxton-view-improvements to c0337e8

2013-05-28 Thread garren 
Updated Branches:
  refs/heads/fauxton-view-improvements 2171e1612 - c0337e867


create new view with new design doc and improve changes view


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

Branch: refs/heads/fauxton-view-improvements
Commit: c0337e86766f2f69544085224f3d36167ff798bc
Parents: 2171e16
Author: Garren Smith garren.sm...@gmail.com
Authored: Tue May 28 15:44:17 2013 +0200
Committer: Garren Smith garren.sm...@gmail.com
Committed: Tue May 28 15:44:17 2013 +0200

--
 src/fauxton/app/modules/databases/resources.js |2 +-
 src/fauxton/app/modules/documents/resources.js |1 +
 src/fauxton/app/modules/documents/routes.js|   15 +-
 src/fauxton/app/modules/documents/views.js |  204 +--
 src/fauxton/app/templates/documents/changes.html   |4 +-
 .../app/templates/documents/view_editor.html   |   38 ++-
 6 files changed, 167 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c0337e86/src/fauxton/app/modules/databases/resources.js
--
diff --git a/src/fauxton/app/modules/databases/resources.js 
b/src/fauxton/app/modules/databases/resources.js
index 6927fd5..04e6c1e 100644
--- a/src/fauxton/app/modules/databases/resources.js
+++ b/src/fauxton/app/modules/databases/resources.js
@@ -47,7 +47,7 @@ function(app, FauxtonAPI, Documents) {
   if (context === index) {
 return /database/ + this.id + /_all_docs;
   } else if (context === changes) {
-return /database/ + this.id + /_changes?descending=truelimit=100;
+return /database/ + this.id + 
/_changes?descending=truelimit=100include_docs=true;
   } else if (context === app) {
 return /database/ + this.id;
   } else {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c0337e86/src/fauxton/app/modules/documents/resources.js
--
diff --git a/src/fauxton/app/modules/documents/resources.js 
b/src/fauxton/app/modules/documents/resources.js
index 9f6eacf..e313378 100644
--- a/src/fauxton/app/modules/documents/resources.js
+++ b/src/fauxton/app/modules/documents/resources.js
@@ -109,6 +109,7 @@ function(app, FauxtonAPI) {
   var doc = this.get('doc');
 
   if (doc) {
+console.log('DOC', doc);
 return new Documents.Doc(doc, {database: this.database});
   } 
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c0337e86/src/fauxton/app/modules/documents/routes.js
--
diff --git a/src/fauxton/app/modules/documents/routes.js 
b/src/fauxton/app/modules/documents/routes.js
index 929f1b3..e02ac93 100644
--- a/src/fauxton/app/modules/documents/routes.js
+++ b/src/fauxton/app/modules/documents/routes.js
@@ -62,7 +62,8 @@ function(app, FauxtonAPI, Documents, Databases) {
 code_editor: function (event) {
   this.tabsView.updateSelected('code_editor');
   this.docView = this.setView(#dashboard-content, new 
Documents.Views.Doc({
-model: this.doc
+model: this.doc,
+database: this.database
   }));
 },
 
@@ -92,7 +93,8 @@ function(app, FauxtonAPI, Documents, Databases) {
 
 events: {
   route:updateAllDocs: updateAllDocsFromView,
-  route:updatePreviewDocs: updateAllDocsFromPreview
+  route:updatePreviewDocs: updateAllDocsFromPreview,
+  route:reloadDesignDocs: reloadDesignDocs
 },
 
 initialize: function (route, masterLayout, options) {
@@ -130,7 +132,6 @@ function(app, FauxtonAPI, Documents, Databases) {
   var docOptions = app.getParams(options);
 
   docOptions.include_docs = true;
-  console.log('doc options', docOptions);
   this.data.database.buildAllDocs(docOptions);
 
   if (docOptions.startkey  docOptions.startkey.indexOf('_design')  -1) {
@@ -252,6 +253,14 @@ function(app, FauxtonAPI, Documents, Databases) {
 nestedView: Documents.Views.Row,
 viewList: true
   }));
+},
+
+reloadDesignDocs: function (event) {
+  this.sidebar.forceRender();
+
+  if (event  event.selectedTab) {
+this.sidebar.setSelectedTab(event.selectedTab);
+  }
 }
   });
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/c0337e86/src/fauxton/app/modules/documents/views.js
--
diff --git a/src/fauxton/app/modules/documents/views.js 
b/src/fauxton/app/modules/documents/views.js
index ad29406..f5cd882 100644
--- a/src/fauxton/app/modules/documents/views.js
+++

git commit: updated refs/heads/1.3.x to ade3ea1

2013-05-28 Thread kocolosk 
Updated Branches:
  refs/heads/1.3.x 1421a2246 - ade3ea13d


Save the auth values so if the AuthSession cookie has passed the Time left 
threshold it gets updated


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

Branch: refs/heads/1.3.x
Commit: ade3ea13d21ccf5a9ce3424f6709930ef8dedbb9
Parents: 1421a22
Author: Martin Higham mar...@ocastalabs.com
Authored: Wed May 22 10:43:40 2013 +0100
Committer: Adam Kocoloski kocol...@apache.org
Committed: Tue May 28 10:34:41 2013 -0400

--
 src/couchdb/couch_httpd.erl |3 ++-
 src/couchdb/couch_httpd_rewrite.erl |5 -
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ade3ea13/src/couchdb/couch_httpd.erl
--
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 66d28d2..7c89d0e 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -316,7 +316,8 @@ handle_request_int(MochiReq, DefaultFun,
 design_url_handlers = DesignUrlHandlers,
 default_fun = DefaultFun,
 url_handlers = UrlHandlers,
-user_ctx = erlang:erase(pre_rewrite_user_ctx)
+user_ctx = erlang:erase(pre_rewrite_user_ctx),
+auth = erlang:erase(pre_rewrite_auth)
 },
 
 HandlerFun = couch_util:dict_find(HandlerKey, UrlHandlers, DefaultFun),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ade3ea13/src/couchdb/couch_httpd_rewrite.erl
--
diff --git a/src/couchdb/couch_httpd_rewrite.erl 
b/src/couchdb/couch_httpd_rewrite.erl
index 232d2a3..1187397 100644
--- a/src/couchdb/couch_httpd_rewrite.erl
+++ b/src/couchdb/couch_httpd_rewrite.erl
@@ -198,8 +198,11 @@ handle_rewrite_req(#httpd{
 design_url_handlers = DesignUrlHandlers,
 default_fun = DefaultFun,
 url_handlers = UrlHandlers,
-user_ctx = UserCtx
+user_ctx = UserCtx,
+   auth = Auth
 } = Req,
+
+erlang:put(pre_rewrite_auth, Auth),
 erlang:put(pre_rewrite_user_ctx, UserCtx),
 couch_httpd:handle_request_int(MochiReq1, DefaultFun,
 UrlHandlers, DbUrlHandlers, DesignUrlHandlers)

git commit: updated refs/heads/1.3.x to 01afaa4

2013-05-28 Thread dch 
Updated Branches:
  refs/heads/1.3.x ade3ea13d - 01afaa4f0


COUCHDB-1784 update license.skip to support VPATH builds


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

Branch: refs/heads/1.3.x
Commit: 01afaa4f00f11ce4c66a187d8d443d8a2d0533cc
Parents: ade3ea1
Author: Dave Cottlehuber d...@apache.org
Authored: Tue Apr 30 14:51:09 2013 +0200
Committer: Dave Cottlehuber d...@apache.org
Committed: Tue May 28 17:41:57 2013 +0200

--
 Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/01afaa4f/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 9be97f3..8703a30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,5 +159,5 @@ distcheck-hook:
$(MAKE) -C src/couchdb/priv distcheck-hook
$(MAKE) -C share/doc/build distcheck-hook
grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \
-   | grep --include= -vEf license.skip; \
+   | grep --include= -vEf $(top_srcdir)/license.skip; \
test $$? -eq 1

[1/2] git commit: updated refs/heads/master to cd42fa0

2013-05-28 Thread dch 
Updated Branches:
  refs/heads/master 3357462ad - cd42fa02b


COUCHDB-1784 update license.skip to support VPATH builds


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

Branch: refs/heads/master
Commit: 6f1742e392e5f6166f1b6898e042ea4fc0f0717f
Parents: 3357462
Author: Dave Cottlehuber d...@apache.org
Authored: Tue Apr 30 14:51:09 2013 +0200
Committer: Dave Cottlehuber d...@apache.org
Committed: Tue May 28 17:51:12 2013 +0200

--
 Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f1742e3/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 9be97f3..8703a30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,5 +159,5 @@ distcheck-hook:
$(MAKE) -C src/couchdb/priv distcheck-hook
$(MAKE) -C share/doc/build distcheck-hook
grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \
-   | grep --include= -vEf license.skip; \
+   | grep --include= -vEf $(top_srcdir)/license.skip; \
test $$? -eq 1

[2/2] git commit: updated refs/heads/master to cd42fa0

2013-05-28 Thread dch 
Update CHANGES for 1.3.1

COUCHDB-1696


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

Branch: refs/heads/master
Commit: cd42fa02b994f332f925685240290c1d3612b8fb
Parents: 6f1742e
Author: Dave Cottlehuber d...@apache.org
Authored: Tue May 28 17:55:55 2013 +0200
Committer: Dave Cottlehuber d...@apache.org
Committed: Tue May 28 17:55:55 2013 +0200

--
 CHANGES |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cd42fa02/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 578efaa..08cb160 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,7 +42,7 @@ Apache CouchDB CHANGES
 # Misc:
 
 #  * Improve documentation: better structure, improve language, less 
duplication.
-#  * Improvements to test suite.
+#  * Improvements to test suite and VPATH build system.
 
 Version 1.3.0
 -

git commit: updated refs/heads/1.3.x to c9b53a6

2013-05-28 Thread dch 
Updated Branches:
  refs/heads/1.3.x 01afaa4f0 - c9b53a6fe


Update CHANGES for 1.3.1

COUCHDB-1696


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

Branch: refs/heads/1.3.x
Commit: c9b53a6feaa38545dfcaf02c3dd9b33e89ceabea
Parents: 01afaa4
Author: Dave Cottlehuber d...@apache.org
Authored: Tue May 28 17:57:35 2013 +0200
Committer: Dave Cottlehuber d...@apache.org
Committed: Tue May 28 17:57:35 2013 +0200

--
 CHANGES |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c9b53a6f/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 8057814..00f444f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,7 +23,7 @@ View Server:
 Misc:
 
  * Improve documentation: better structure, improve language, less duplication.
- * Improvements to test suite.
+ * Improvements to test suite and VPATH build system.
 
 Version 1.3.0
 -

[Couchdb Wiki] Update of ContributorsGroup by DaveCottlehuber

2013-05-28 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Couchdb Wiki for 
change notification.

The ContributorsGroup page has been changed by DaveCottlehuber:
https://wiki.apache.org/couchdb/ContributorsGroup?action=diffrev1=80rev2=81

Comment:
DrDarkMatter joins the fold

   * ThomasVanderStichele
   * timcharper
   * TimJuravich
+  * TinaP
   * VincentDaron
   * VolkerMische
   * WendallCada

[Couchdb Wiki] Update of ContributorsGroup by DaveCottlehuber

2013-05-28 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Couchdb Wiki for 
change notification.

The ContributorsGroup page has been changed by DaveCottlehuber:
https://wiki.apache.org/couchdb/ContributorsGroup?action=diffrev1=81rev2=82

Comment:
committers are admins

   * sebjames
   * ShouryaSarcar
   * SimonDeBoer
-  * SimonMetson
   * skoegl
   * StephaneAlnet
   * stuffmc

git commit: updated refs/heads/1.3.x to d973463

2013-05-28 Thread djc 
Updated Branches:
  refs/heads/1.3.x c9b53a6fe - d9734633c


Port NEWS/CHANGES updates to change log.


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

Branch: refs/heads/1.3.x
Commit: d9734633cef8ffa52cd116d2c900a31bac96792e
Parents: c9b53a6
Author: Dirkjan Ochtman d...@apache.org
Authored: Tue May 28 19:34:38 2013 +0200
Committer: Dirkjan Ochtman d...@apache.org
Committed: Tue May 28 19:34:38 2013 +0200

--
 share/doc/src/changelog.rst |   11 +--
 1 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d9734633/share/doc/src/changelog.rst
--
diff --git a/share/doc/src/changelog.rst b/share/doc/src/changelog.rst
index b85ef75..b933b9a 100644
--- a/share/doc/src/changelog.rst
+++ b/share/doc/src/changelog.rst
@@ -56,13 +56,20 @@ Log System
 ^^
 
 * Don't log about missing .compact files. :commit:`06f1a8dc`
-* Fix bug in WARN level logging from 1.3.0.
+* :issue:`1794`: Fix bug in WARN level logging from 1.3.0.
+
+View Server
+^^^
+
+* :issue:`1792`: Fix the -S option to couchjs to increase memory limits.
+  :commit:`cfaa66cd`
 
 Miscellaneous
 ^
 
 * Improve documentation: better structure, improve language, less duplication.
-* Improvements to test suite.
+* :issue:`1784`: Improvements to test suite and VPATH build system.
+  :commit:`01afaa4f`
 
 Version 1.3.0
 -

[1/2] git commit: updated refs/heads/1696-backport-mochiweb-2-4-2-1.3.x to 266cd32

2013-05-28 Thread dch 
Updated Branches:
  refs/heads/1696-backport-mochiweb-2-4-2-1.3.x [created] 266cd3288


Use pmods to let mochiweb run under OTP R14-R16

Uses pmod_parse-transform library extracted from OTP R15:

  https://github.com/erlang/pmod_transform

Thanks to macports team for putting this together:

  https://trac.macports.org/ticket/38395


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

Branch: refs/heads/1696-backport-mochiweb-2-4-2-1.3.x
Commit: 50e5b1e49abd9eed7c9c4fe67e2120158f7e39fa
Parents: c9b53a6
Author: Dave Cottlehuber d...@apache.org
Authored: Tue May 28 19:40:13 2013 +0200
Committer: Dave Cottlehuber d...@apache.org
Committed: Tue May 28 19:44:19 2013 +0200

--
 configure.ac   |4 +-
 src/mochiweb/Makefile.am   |6 +-
 src/mochiweb/mochifmt_records.erl  |2 +
 src/mochiweb/mochifmt_std.erl  |2 +
 src/mochiweb/mochiweb_request.erl  |2 +
 src/mochiweb/mochiweb_response.erl |2 +
 src/mochiweb/pmod_pt.erl   |  463 +++
 7 files changed, 478 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/50e5b1e4/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 53e23f1..dafdb9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,7 @@ esac
 
 { $as_echo $as_me:${as_lineno-$LINENO}: checking Erlang version 
compatibility 5
 $as_echo_n checking Erlang version compatibility...  6; }
-erlang_version_error=The installed Erlang version must be = R13B04 
(erts-5.7.4) and  R16A (erts-5.10)
+erlang_version_error=The installed Erlang version must be = R13B04 
(erts-5.7.4) and  R17 (erts-5.11)
 
 version=`${ERL} -version 21 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0
 major_version=`echo $version | ${AWK} {print \\$1}`
@@ -420,7 +420,7 @@ if test $major_version -ne 5; then
 as_fn_error $? $erlang_version_error $LINENO 5
 fi
 
-if test $minor_version -lt 7 -o $minor_version -gt 9; then
+if test $minor_version -lt 7 -o $minor_version -gt 10; then
 as_fn_error $? $erlang_version_error $LINENO 5
 fi
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/50e5b1e4/src/mochiweb/Makefile.am
--
diff --git a/src/mochiweb/Makefile.am b/src/mochiweb/Makefile.am
index d31a6eb..d4c150e 100644
--- a/src/mochiweb/Makefile.am
+++ b/src/mochiweb/Makefile.am
@@ -17,6 +17,7 @@ endif
 mochiwebebindir = $(localerlanglibdir)/mochiweb-1.4.1/ebin
 
 mochiweb_file_collection = \
+   pmod_pt.erl \
mochifmt.erl \
mochifmt_records.erl \
mochifmt_std.erl \
@@ -55,6 +56,7 @@ mochiweb_file_collection = \
reloader.erl
 
 mochiwebebin_make_generated_file_list = \
+   pmod_pt.beam \
mochifmt.beam \
mochifmt_records.beam \
mochifmt_std.beam \
@@ -106,5 +108,7 @@ CLEANFILES = \
 mochijson2.beam: mochijson2.erl
$(ERLC) $(ERLC_FLAGS) $(MOCHIJSON_ERLC_FLAGS) $
 
+mochifmt_records.beam mochifmt_std.beam mochiweb_request.beam 
mochiweb_response.beam: pmod_pt.beam
+
 %.beam: %.erl
-   $(ERLC) $(ERLC_FLAGS) $
+   $(ERLC) $(ERLC_FLAGS) -pa . $

http://git-wip-us.apache.org/repos/asf/couchdb/blob/50e5b1e4/src/mochiweb/mochifmt_records.erl
--
diff --git a/src/mochiweb/mochifmt_records.erl 
b/src/mochiweb/mochifmt_records.erl
index 2326d1d..d720df2 100644
--- a/src/mochiweb/mochifmt_records.erl
+++ b/src/mochiweb/mochifmt_records.erl
@@ -13,6 +13,8 @@
 -author('b...@mochimedia.com').
 -export([get_value/2]).
 
+-compile({parse_transform, pmod_pt}).
+
 get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) -
 try begin
 Atom = list_to_existing_atom(Key),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/50e5b1e4/src/mochiweb/mochifmt_std.erl
--
diff --git a/src/mochiweb/mochifmt_std.erl b/src/mochiweb/mochifmt_std.erl
index d4d74f6..4005f6d 100644
--- a/src/mochiweb/mochifmt_std.erl
+++ b/src/mochiweb/mochifmt_std.erl
@@ -7,6 +7,8 @@
 -author('b...@mochimedia.com').
 -export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]).
 
+-compile({parse_transform, pmod_pt}).
+
 format(Format, Args) -
 mochifmt:format(Format, Args, THIS).
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/50e5b1e4/src/mochiweb/mochiweb_request.erl
--
diff --git a/src/mochiweb/mochiweb_request.erl 
b/src/mochiweb/mochiweb_request.erl
index

[2/2] git commit: updated refs/heads/1696-backport-mochiweb-2-4-2-1.3.x to 266cd32

2013-05-28 Thread dch 
Update NOTICE/NEWS/CHANGES/Changelog.rst for mochiweb backport


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

Branch: refs/heads/1696-backport-mochiweb-2-4-2-1.3.x
Commit: 266cd3288f1f964f6cfc8ade874b443d0d382794
Parents: 50e5b1e
Author: Dave Cottlehuber d...@apache.org
Authored: Tue May 28 19:57:10 2013 +0200
Committer: Dave Cottlehuber d...@apache.org
Committed: Tue May 28 20:04:51 2013 +0200

--
 CHANGES |1 +
 NEWS|3 ++-
 NOTICE  |4 
 share/doc/src/changelog.rst |2 ++
 4 files changed, 9 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/266cd328/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 00f444f..18aabdb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ Misc:
 
  * Improve documentation: better structure, improve language, less duplication.
  * Improvements to test suite and VPATH build system.
+ * Add support for Erlang R16B through pmod-transform library.
 
 Version 1.3.0
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/266cd328/NEWS
--
diff --git a/NEWS b/NEWS
index 486daf0..9d777b8 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,8 @@ Version 1.3.1
  * Don't log about missing .compact files.
  * Fix bug in WARN level logging from 1.3.0.
  * Improve documentation: better structure, improve language, less duplication.
- * Improvements to test suite.
+ * Improvements to test suite and build system.
+ * Add support for Erlang R16B through pmod-transform library.
 
 Version 1.3.0
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/266cd328/NOTICE
--
diff --git a/NOTICE b/NOTICE
index e6ef17d..a8e7210 100644
--- a/NOTICE
+++ b/NOTICE
@@ -73,3 +73,7 @@ This product also includes the following third-party 
components:
  * Underscore.js 1.4.2 (http://underscorejs.org)
 
Copyright 2012, Jeremy Ashkenas
+
+ * Erlang/OTP pmod parse-transfrom library
+
+   Copyright, 2013, ERLANG PUBLIC LICENSE Version 1.1

http://git-wip-us.apache.org/repos/asf/couchdb/blob/266cd328/share/doc/src/changelog.rst
--
diff --git a/share/doc/src/changelog.rst b/share/doc/src/changelog.rst
index b85ef75..4fea3cc 100644
--- a/share/doc/src/changelog.rst
+++ b/share/doc/src/changelog.rst
@@ -63,6 +63,8 @@ Miscellaneous
 
 * Improve documentation: better structure, improve language, less duplication.
 * Improvements to test suite.
+* :issue`1696`: Add support for Erlang R16B through pmod-transform library.
+  :commit:`50e5b1e`
 
 Version 1.3.0
 -

git commit: updated refs/heads/1696-backport-mochiweb-2-4-2-1.3.x to 92c33a7

2013-05-28 Thread dch 
Updated Branches:
  refs/heads/1696-backport-mochiweb-2-4-2-1.3.x 266cd3288 - 92c33a7ee


COUCHDB-1696 sort ETS table results in test suite to support R16B


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

Branch: refs/heads/1696-backport-mochiweb-2-4-2-1.3.x
Commit: 92c33a7ee7d753ace9e1ea764fd74a329e6ab3fb
Parents: 266cd32
Author: Dave Cottlehuber d...@apache.org
Authored: Tue Mar 19 10:12:02 2013 +0100
Committer: Dave Cottlehuber d...@apache.org
Committed: Tue May 28 20:43:10 2013 +0200

--
 test/etap/120-stats-collect.t |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/92c33a7e/test/etap/120-stats-collect.t
--
diff --git a/test/etap/120-stats-collect.t b/test/etap/120-stats-collect.t
index dee8876..a30f9ac 100755
--- a/test/etap/120-stats-collect.t
+++ b/test/etap/120-stats-collect.t
@@ -84,7 +84,7 @@ test_proc_counting() -
 etap:is(
 couch_stats_collector:get(hoopla),
 1,
-track_process_count incrememnts the counter.
+track_process_count increments the counter.
 ),
 
 TwicePid = spawn(fun() -
@@ -124,21 +124,21 @@ test_all() -
 couch_stats_collector:record(bar, 0.0),
 couch_stats_collector:record(bar, 1.0),
 etap:is(
-couch_stats_collector:all(),
-[{foo, 0}, {hoopla, 0}, {bar, [1.0, 0.0]}],
+lists:sort(couch_stats_collector:all()),
+[ {bar,[1.0,0.0]}, {foo,0}, { hoopla,0} ],
 all/0 returns all counters and absolute values.
 ),
 
 etap:is(
-couch_stats_collector:all(incremental),
-[{foo, 0}, {hoopla, 0}],
+lists:sort(couch_stats_collector:all(incremental)),
+[ {foo, 0}, {hoopla, 0} ],
 all/1 returns only the specified type.
 ),
 
 couch_stats_collector:record(zing, 90),
 etap:is(
-couch_stats_collector:all(absolute),
-[{zing, [90]}, {bar, [1.0, 0.0]}],
+lists:sort(couch_stats_collector:all(absolute)),
+[ {bar,[1.0,0.0]}, {zing,Z} ],
 all/1 returns only the specified type.
 ),
 ok.

[2/2] git commit: updated refs/heads/1.3.x to e348a73

2013-05-28 Thread nslater 
Bump to 1.3.1


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

Branch: refs/heads/1.3.x
Commit: e348a73e0833f9233248c7724d9c1108dfc531be
Parents: 2022d02
Author: Noah Slater nsla...@apache.org
Authored: Tue May 28 20:44:59 2013 +0100
Committer: Noah Slater nsla...@apache.org
Committed: Tue May 28 20:44:59 2013 +0100

--
 acinclude.m4.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e348a73e/acinclude.m4.in
--
diff --git a/acinclude.m4.in b/acinclude.m4.in
index ad29853..5297d41 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -18,7 +18,7 @@ m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
 m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
 m4_define([LOCAL_VERSION_MAJOR], [1])
 m4_define([LOCAL_VERSION_MINOR], [3])
-m4_define([LOCAL_VERSION_REVISION], [0])
+m4_define([LOCAL_VERSION_REVISION], [1])
 m4_define([LOCAL_VERSION_STAGE], [])
 m4_define([LOCAL_VERSION_RELEASE], [])
 m4_define([LOCAL_VERSION_PRIMARY],

git commit: updated refs/heads/1.3.x to af5edba

2013-05-28 Thread nslater 
Updated Branches:
  refs/heads/1.3.x e348a73e0 - af5edba3c


Remove not released yet comment


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

Branch: refs/heads/1.3.x
Commit: af5edba3c4b5aa49bace6d588b6d0f402c473e90
Parents: e348a73
Author: Noah Slater nsla...@apache.org
Authored: Tue May 28 20:50:31 2013 +0100
Committer: Noah Slater nsla...@apache.org
Committed: Tue May 28 20:50:31 2013 +0100

--
 CHANGES |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/af5edba3/CHANGES
--
diff --git a/CHANGES b/CHANGES
index fc13875..a26f4b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,8 +4,6 @@ Apache CouchDB CHANGES
 Version 1.3.1
 -
 
-This version has not been released yet.
-
 Replicator:
 
  * Tolerate missing source and target fields in _replicator docs 
(COUCHDB-1788).

[2/2] git commit: updated refs/heads/master to fed3302

2013-05-28 Thread nslater 
Remove 1.2.3 sections


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

Branch: refs/heads/master
Commit: fed33028605a7803c9d94a9f60c6e875297cd890
Parents: 06b9aa5
Author: Noah Slater nsla...@apache.org
Authored: Tue May 28 21:04:46 2013 +0100
Committer: Noah Slater nsla...@apache.org
Committed: Tue May 28 21:04:46 2013 +0100

--
 CHANGES |5 -
 NEWS|5 -
 2 files changed, 0 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/fed33028/CHANGES
--
diff --git a/CHANGES b/CHANGES
index fd8187b..269ace0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -116,11 +116,6 @@ Build System:
  * Fixed issue in couchdb script where stopped status returns before process
exits.
 
-# Version 1.2.3
-# -
-#
-# This version has not been released yet.
-
 Version 1.2.2
 -
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fed33028/NEWS
--
diff --git a/NEWS b/NEWS
index ee45eff..b040194 100644
--- a/NEWS
+++ b/NEWS
@@ -46,11 +46,6 @@ Version 1.3.0
version.
  * Experimental support for Cross-Origin Resource Sharing (CORS).
 
-# Version 1.2.3
-# -
-#
-# This version has not been released yet.
-
 Version 1.2.2
 -

[1/2] git commit: updated refs/heads/master to fed3302

2013-05-28 Thread nslater 
Updated Branches:
  refs/heads/master cd42fa02b - fed330286


Forward port 1.3.1 changes


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

Branch: refs/heads/master
Commit: 06b9aa50abdb572a98e44cfff4b7e89bf01e2fbc
Parents: cd42fa0
Author: Noah Slater nsla...@apache.org
Authored: Tue May 28 21:03:03 2013 +0100
Committer: Noah Slater nsla...@apache.org
Committed: Tue May 28 21:03:03 2013 +0100

--
 CHANGES |   27 ---
 NEWS|   16 +++-
 share/doc/src/changelog.rst |   28 
 3 files changed, 47 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/06b9aa50/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 08cb160..fd8187b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,29 +20,26 @@ Apache CouchDB CHANGES
 #  * Bump Mochiweb dependency to v2.4.2.
 #  * Minimum Erlang/OTP version is now R14B.
 
-# Version 1.3.1
-# -
-#
-# This version has not been released yet.
+Version 1.3.1
+-
 
-# Replicator:
+Replicator:
 
-#  * Tolerate missing source and target fields in _replicator docs
-  (COUCHDB-1788).
+ * Tolerate missing source and target fields in _replicator docs 
(COUCHDB-1788).
 
-# Log System:
+Log System:
 
-#  * Don't log about missing .compact files.
-#  * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
 
-# View Server:
+View Server:
 
-#  * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
+ * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
 
-# Misc:
+Misc:
 
-#  * Improve documentation: better structure, improve language, less 
duplication.
-#  * Improvements to test suite and VPATH build system.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite and VPATH build system.
 
 Version 1.3.0
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/06b9aa50/NEWS
--
diff --git a/NEWS b/NEWS
index efa79aa..ee45eff 100644
--- a/NEWS
+++ b/NEWS
@@ -16,16 +16,14 @@ Each release section notes when backwards incompatible 
changes have been made.
 #  * Bump Mochiweb dependency to v2.4.2.
 #  * Minimum Erlang/OTP version is now R14B.
 
-# Version 1.3.1
-# -
-#
-# This version has not been released yet.
+Version 1.3.1
+-
 
-#  * Tolerate missing source and target fields in _replicator docs.
-#  * Don't log about missing .compact files.
-#  * Fix bug in WARN level logging from 1.3.0.
-#  * Improve documentation: better structure, improve language, less 
duplication.
-#  * Improvements to test suite.
+ * Tolerate missing source and target fields in _replicator docs.
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite.
 
 Version 1.3.0
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/06b9aa50/share/doc/src/changelog.rst
--
diff --git a/share/doc/src/changelog.rst b/share/doc/src/changelog.rst
index 2f2334d..b933b9a 100644
--- a/share/doc/src/changelog.rst
+++ b/share/doc/src/changelog.rst
@@ -43,6 +43,34 @@ CouchDB 1.0.x release.
CouchDB 1.0.x you must back up your data files before performing the
upgrade and compaction process.
 
+Version 1.3.1
+-
+
+Replicator
+^^
+
+* :issue:`1788`: Tolerate missing source and target fields in _replicator docs.
+  :commit:`869f42e2`
+
+Log System
+^^
+
+* Don't log about missing .compact files. :commit:`06f1a8dc`
+* :issue:`1794`: Fix bug in WARN level logging from 1.3.0.
+
+View Server
+^^^
+
+* :issue:`1792`: Fix the -S option to couchjs to increase memory limits.
+  :commit:`cfaa66cd`
+
+Miscellaneous
+^
+
+* Improve documentation: better structure, improve language, less duplication.
+* :issue:`1784`: Improvements to test suite and VPATH build system.
+  :commit:`01afaa4f`
+
 Version 1.3.0
 -

[Couchdb Wiki] Update of Release_Procedure by NoahSlater

2013-05-28 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Couchdb Wiki for 
change notification.

The Release_Procedure page has been changed by NoahSlater:
https://wiki.apache.org/couchdb/Release_Procedure?action=diffrev1=218rev2=219

  
  == Preparing the Community ==
  
+ ''This section has been superseded by the Timetable section above.''
+ 
  ''This section will eventually include a step that requires you to check 
Travis.''
  
  ''Unfortunately, our continuous integration system needs some work before we 
can add this to the release procedure.''

git commit: updated refs/heads/1.3.x to 257fc5c

2013-05-28 Thread nslater 
Updated Branches:
  refs/heads/1.3.x af5edba3c - 257fc5cc2


Distribute test_setup.js


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

Branch: refs/heads/1.3.x
Commit: 257fc5cc21232b9f54226b6b869e67fb6fbdd158
Parents: af5edba
Author: Noah Slater nsla...@apache.org
Authored: Tue May 28 21:35:08 2013 +0100
Committer: Noah Slater nsla...@apache.org
Committed: Tue May 28 21:35:08 2013 +0100

--
 test/javascript/Makefile.am |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/257fc5cc/test/javascript/Makefile.am
--
diff --git a/test/javascript/Makefile.am b/test/javascript/Makefile.am
index d7367e0..e7036ca 100644
--- a/test/javascript/Makefile.am
+++ b/test/javascript/Makefile.am
@@ -13,6 +13,7 @@
 EXTRA_DIST = \
cli_runner.js \
couch_http.js \
+   test_setup.js \
run.tpl
 
 noinst_SCRIPTS = run

git commit: updated refs/heads/master to 86dd4ea

2013-05-28 Thread nslater 
Updated Branches:
  refs/heads/master fed330286 - 86dd4eadf


Distribute test_setup.js


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

Branch: refs/heads/master
Commit: 86dd4eadf7b96ecb861e94ff4570248b2936a556
Parents: fed3302
Author: Noah Slater nsla...@apache.org
Authored: Tue May 28 21:35:08 2013 +0100
Committer: Noah Slater nsla...@apache.org
Committed: Tue May 28 21:35:36 2013 +0100

--
 test/javascript/Makefile.am |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/86dd4ead/test/javascript/Makefile.am
--
diff --git a/test/javascript/Makefile.am b/test/javascript/Makefile.am
index d7367e0..e7036ca 100644
--- a/test/javascript/Makefile.am
+++ b/test/javascript/Makefile.am
@@ -13,6 +13,7 @@
 EXTRA_DIST = \
cli_runner.js \
couch_http.js \
+   test_setup.js \
run.tpl
 
 noinst_SCRIPTS = run

[Couchdb Wiki] Update of Installing_on_Debian by DaveCottlehuber

2013-05-28 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Couchdb Wiki for 
change notification.

The Installing_on_Debian page has been changed by DaveCottlehuber:
https://wiki.apache.org/couchdb/Installing_on_Debian?action=diffrev1=3rev2=4

  pip install sphinx docutils pygments
  }}}
  
+ 
+ == rough notes for wheezy 7.0 x64 from dch ==
+ 
+ {{{
+ # use ESL and Cloudant builds to save time
+ sudo apt-get install -y lsb-release
+ echo deb http://binaries.erlang-solutions.com/debian `lsb_release -cs` 
contrib | sudo tee /etc/apt/sources.list.d/erlang-solutions.list
+ wget -O - http://binaries.erlang-solutions.com/debian/erlang_solutions.asc | 
sudo apt-key add -
+ 
+ echo deb http://packages.cloudant.com/debian `lsb_release -cs` main | sudo 
tee /etc/apt/sources.list.d/cloudant.list
+ wget http://packages.cloudant.com/KEYS -O - | sudo apt-key add -
+ # install erlang pre-reqs
+ 
+ sudo apt-get update
+ 
+ # build tools
+ sudo aptitude install -y build-essential libtool autoconf automake 
autoconf-archive pkg-config
+ sudo aptitude install -y build-essential libtool autoconf automake 
autoconf-archive pkg-config git
+ # dependencies for libmozjs etc
+ sudo apt-get install -y  libmozjs185-cloudant libmozjs185-cloudant-dev 
libnspr4 libnspr4-0d libnspr4-dev libcurl4-openssl-dev curl 
+ 
+ # dependencies for building erlang releases
+ sudo apt-get install -y libssl-dev zlib1g zlib1g-dev libcurl4-openssl-dev 
lsb-base  ncurses-dev libncurses-dev libicu-dev xsltproc
+ # optional for building documentation
+ sudo aptitude install -y help2man python-sphinx texlive-latex-base 
texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended texinfo
+ }}}
+ 
+ If you need custom erlang versions, use kerl, otherwise {{{apt-get install -y 
esl-erlang}}} and skip this section.
+ 
+ {{{
+ curl https://raw.github.com/spawngrid/kerl/master/kerl  ~/bin/kerl \
+  chmod a+x ~/bin/kerl
+ export PATH=$PATH:~/bin
+ kerl update releases
+ kerl build R14B04 r14b04
+ kerl install r14b04 ~/erlbrew/r14b04
+ kerl build R15B03-1 r15b03
+ kerl install r15b03 ~/erlbrew/r15b03
+ kerl build R16B r16b
+ kerl install r16b ~/erlbrew/r16b
+ . ~/erlbrew/r14b04/activate
+ }}}
+ 
+ After that, cloning or downloading couchdb tarball and configure/build should 
Just Work.
+