git commit: Move myself from THANKS to AUTHORS.

2013-02-11 Thread wohali 
Updated Branches:
  refs/heads/master 78f305449 - 6beb66c71


Move myself from THANKS to AUTHORS.

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

Branch: refs/heads/master
Commit: 6beb66c7179cca8b578934b6c4b6f47437e0c663
Parents: 78f3054
Author: Joan Touzet woh...@apache.org
Authored: Mon Feb 11 13:36:45 2013 -0500
Committer: Joan Touzet woh...@apache.org
Committed: Mon Feb 11 13:36:45 2013 -0500

--
 AUTHORS   |1 +
 THANKS.in |1 -
 2 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6beb66c7/AUTHORS
--
diff --git a/AUTHORS b/AUTHORS
index 49b5ef1..8577381 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,5 +20,6 @@ documentation or developing software. Some of these people 
are:
  * Bob Dionne bitdid...@apache.org
  * Dave Cottlehuber d...@apache.org
  * Jason Smith j...@apache.org
+ * Joan Touzet jo...@ieee.org
 
 For a list of other credits see the `THANKS` file.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/6beb66c7/THANKS.in
--
diff --git a/THANKS.in b/THANKS.in
index ec0f8d3..4ebf3f0 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -94,7 +94,6 @@ suggesting improvements or submitting changes. Some of these 
people are:
  * Fedor Indutny fe...@indutny.com
  * Tim Blair
  * Tady Walsh he...@tady.me
- * Joan Touzet jo...@ieee.org
 # Authors from commit 6c976bd and onwards are auto-inserted. If you are merging
 # a commit from a non-committer, you should not add an entry to this file. When
 # `bootstrap` is run, the actual THANKS file will be generated.

git commit: updated refs/heads/master to 8d37911

2013-03-27 Thread wohali 
Updated Branches:
  refs/heads/master e18f0bdb3 - 8d379113e


Add upper bound check on Erlang (R16A)

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

Branch: refs/heads/master
Commit: 8d379113eb6ce0300f56711aca274bb87d400dd0
Parents: e18f0bd
Author: Joan Touzet woh...@apache.org
Authored: Wed Mar 27 17:52:27 2013 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Wed Mar 27 17:52:27 2013 -0400

--
 configure.ac |   25 +++--
 1 files changed, 15 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/8d379113/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 91e2d3d..53e23f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -407,24 +407,29 @@ case $(uname -s) in
 esac
 
 
-erlang_version_error=The installed Erlang version is less than 5.7.4 
(R13B04).
+{ $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)
 
-version=`${ERL} -version 21 | ${SED} 's/[[^0-9]]/ /g'`
+version=`${ERL} -version 21 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0
+major_version=`echo $version | ${AWK} {print \\$1}`
+minor_version=`echo $version | ${AWK} {print \\$2}`
+patch_version=`echo $version | ${AWK} {print \\$3}`
 
-if test `echo $version | ${AWK} {print \\$1}` -lt 5; then
-AC_MSG_ERROR([$erlang_version_error])
+if test $major_version -ne 5; then
+as_fn_error $? $erlang_version_error $LINENO 5
 fi
 
-if test `echo $version | ${AWK} {print \\$2}` -lt 7; then
-AC_MSG_ERROR([$erlang_version_error])
+if test $minor_version -lt 7 -o $minor_version -gt 9; then
+as_fn_error $? $erlang_version_error $LINENO 5
 fi
 
-if test `echo $version | ${AWK} {print \\$2}` -eq 7; then
-if test `echo $version | ${AWK} {print \\$3}` -lt 4; then
-AC_MSG_ERROR([$erlang_version_error])
-fi
+if test $minor_version -eq 7 -a $patch_version -lt 4; then
+as_fn_error $? $erlang_version_error $LINENO 5
 fi
 
+AC_MSG_RESULT(compatible)
+
 otp_release=`\
 ${ERL} -noshell \
 -eval 'io:put_chars(erlang:system_info(otp_release)).' \

couchdb commit: updated refs/heads/master to 72adab9

2014-02-12 Thread wohali 
Updated Branches:
  refs/heads/master 46edca25a - 72adab904


Update my email address

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

Branch: refs/heads/master
Commit: 72adab90471f107cfd4478d04ecb3b90e3f1d3f4
Parents: 46edca2
Author: Joan Touzet woh...@apache.org
Authored: Wed Feb 12 14:54:44 2014 -0500
Committer: Joan Touzet woh...@apache.org
Committed: Wed Feb 12 14:54:44 2014 -0500

--
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/72adab90/AUTHORS
--
diff --git a/AUTHORS b/AUTHORS
index 1b8c412..863e87b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,7 +20,7 @@ documentation or developing software. Some of these people 
are:
  * Bob Dionne bitdid...@apache.org
  * Dave Cottlehuber d...@apache.org
  * Jason Smith j...@apache.org
- * Joan Touzet jo...@ieee.org
+ * Joan Touzet woh...@apache.org
  * Dale Harvey d...@apache.org
  * Dirkjan Ochtman d...@apache.org
  * Alexander Shorin kxe...@apache.org

couchdb commit: updated refs/heads/master to 0f7be28

2014-03-21 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 0e8c1787a - 0f7be287d


Improving misleading example. Do not emit(foo, doc)!


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

Branch: refs/heads/master
Commit: 0f7be287d6a9358d960beb17b16ad7b5e20bd360
Parents: 0e8c178
Author: Joan Touzet woh...@apache.org
Authored: Fri Mar 21 19:44:58 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Mar 21 19:44:58 2014 -0400

--
 share/doc/src/couchapp/views/collation.rst | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/0f7be287/share/doc/src/couchapp/views/collation.rst
--
diff --git a/share/doc/src/couchapp/views/collation.rst 
b/share/doc/src/couchapp/views/collation.rst
index 9fa8513..06c4c6d 100644
--- a/share/doc/src/couchapp/views/collation.rst
+++ b/share/doc/src/couchapp/views/collation.rst
@@ -28,7 +28,7 @@ property serves as the key, thus the result will be sorted by 
``LastName``:
 
   function(doc) {
 if (doc.Type == customer) {
-  emit(doc.LastName, {FirstName: doc.FirstName, Address: doc.Address});
+  emit(doc.LastName, null);
 }
   }
 
@@ -49,12 +49,17 @@ associated orders. The values 0 and 1 for the sorting token 
are arbitrary.
 
   function(doc) {
 if (doc.Type == customer) {
-  emit([doc._id, 0], doc);
+  emit([doc._id, 0], null);
 } else if (doc.Type == order) {
-  emit([doc.customer_id, 1], doc);
+  emit([doc.customer_id, 1], null);
 }
   }
 
+To list a specific customer with ``_id`` XYZ, and all of that customer's 
orders, limit the startkey and endkey ranges to cover only documents for that 
customer's ``_id``::
+
+  startkey=[XYZ]endkey=[XYZ, {}]
+
+It is not recommended to emit the document itself in the view. Instead, to 
include the bodies of the documents when requesting the view, request the view 
with ``?include_docs=true``.
 
 Sorting by Dates
 
@@ -67,14 +72,14 @@ the following emit function would sort by date:
 
 .. code-block:: javascript
 
-  emit(Date.parse(doc.created_at).getTime(), doc);
+  emit(Date.parse(doc.created_at).getTime(), null);
 
 Alternatively, if you use a date format which sorts lexicographically,
 such as ``2013/06/09 13:52:11 +`` you can just
 
 .. code-block:: javascript
 
-  emit(doc.created_at, doc);
+  emit(doc.created_at, null);
 
 and avoid the conversion. As a bonus, this date format is compatible with the
 JavaScript date parser, so you can use ``new Date(doc.created_at)`` in your

couchdb commit: updated refs/heads/COUCHDB-2221 to 006d819

2014-04-05 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/COUCHDB-2221 [created] 006d81965


Protect against _users doc iterations as string (pbkdf2)


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

Branch: refs/heads/COUCHDB-2221
Commit: 006d81965d9d09d3fe97a45c973198dc166dafda
Parents: 9f6a919
Author: Joan Touzet woh...@apache.org
Authored: Sat Apr 5 22:16:12 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Sat Apr 5 22:16:12 2014 -0400

--
 src/couchdb/couch_httpd_auth.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/006d8196/src/couchdb/couch_httpd_auth.erl
--
diff --git a/src/couchdb/couch_httpd_auth.erl b/src/couchdb/couch_httpd_auth.erl
index 08841fb..abc2054 100644
--- a/src/couchdb/couch_httpd_auth.erl
+++ b/src/couchdb/couch_httpd_auth.erl
@@ -367,7 +367,9 @@ authenticate(Pass, UserProps) -
 {couch_passwords:simple(Pass, UserSalt),
 couch_util:get_value(password_sha, UserProps, nil)};
 pbkdf2 -
-Iterations = couch_util:get_value(iterations, UserProps, 
1),
+Iterations = couch_util:to_integer(
+couch_util:get_value(iterations, UserProps, 1)
+),
 {couch_passwords:pbkdf2(Pass, UserSalt, Iterations),
  couch_util:get_value(derived_key, UserProps, nil)}
 end,

couchdb commit: updated refs/heads/1994-merge-rcouch to 283a3b7

2014-04-18 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/1994-merge-rcouch 7c5af9a90 - 283a3b7f4


Enable Windows build


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

Branch: refs/heads/1994-merge-rcouch
Commit: 283a3b7f4199f240b25474fbe00026d143c8c2e5
Parents: 7c5af9a
Author: Joan Touzet woh...@apache.org
Authored: Fri Apr 18 20:35:36 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Apr 18 20:37:39 2014 -0400

--
 .gitattributes   |  2 ++
 .gitignore   |  5 +++
 Makefile | 96 +++
 support/cp.py| 46 
 support/mkdir.py |  8 +
 support/rm.py| 14 
 6 files changed, 133 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/283a3b7f/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..1135ec5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* -text
+

http://git-wip-us.apache.org/repos/asf/couchdb/blob/283a3b7f/.gitignore
--
diff --git a/.gitignore b/.gitignore
index a8a57e4..35945f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,12 @@
 !.mailmap
 *.beam
 *.diff
+*.exe
 *.gz
 *.la
 *.lo
 *.o
+*.obj
 *.orig
 *.pyc
 *.rej
@@ -14,6 +16,7 @@
 *.tpl
 *~
 .*
+!.gitattributes
 INSTALL
 Makefile.in
 THANKS
@@ -28,6 +31,7 @@ support/rebar/rebar
 support/rebar/inttest/rt.work
 rt.work
 rebar
+rebar.cmd
 support/rebar/.test
 
 # couch_collate
@@ -64,3 +68,4 @@ test/etap/*.o
 test/etap/temp.*
 
 share/doc/build
+/log

http://git-wip-us.apache.org/repos/asf/couchdb/blob/283a3b7f/Makefile
--
diff --git a/Makefile b/Makefile
index 3112dab..cfed7ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,37 @@
-BASE_DIR = $(shell pwd)
+BASE_DIR=$(CURDIR)
 SUPPORT_DIR=$(BASE_DIR)/support
-ERLC ?= $(shell which erlc)
-ESCRIPT ?= $(shell which escript)
 OVERLAY_VARS ?=
 PACKAGE_NAME=apache-couchdb
 RELDIR=$(BASE_DIR)/rel/$(PACKAGE_NAME)
 
+ifeq ($(OS),Windows_NT)
+   ERLC ?= $(shell where erlc)
+   ESCRIPT ?= $(shell where escript)
+   PYTHON ?= $(shell where python)
+   CP=python $(SUPPORT_DIR)/cp.py
+   RM=python $(SUPPORT_DIR)/rm.py
+   MKDIR=python $(SUPPORT_DIR)/mkdir.py
+   CC=cl.exe
+   COUTFLAG ?= /Fe
+   CDEFINE ?= /D
+else
+   ERLC ?= $(shell which erlc)
+   ESCRIPT ?= $(shell which escript)
+   PYTHON ?= $(shell which python)
+   CP=cp -r
+   RM=rm -rf
+   MKDIR=mkdir -p
+   CC ?= cc
+   COUTFLAG ?= -o
+   CDEFINE ?= -D
+endif
 
 $(if $(ERLC),,$(warning Warning: No Erlang found in your path, this will 
probably not work))
 
 $(if $(ESCRIPT),,$(warning Warning: No escript found in your path, this will 
probably not work))
 
+$(if $(PYTHON),,$(warning Warning: No python found in your path, this may not 
work, for Windows or for documentation builds))
+
 .PHONY: rel deps rebar
 
 COUCHDB_STATIC=1
@@ -44,7 +65,7 @@ generate:
 rel: generate
 
 relclean: reldocclean
-   @rm -rf rel/apache-couchdb
+   @$(RM) rel/apache-couchdb
 
 check: test testjs
 
@@ -52,16 +73,18 @@ check: test testjs
 # rebar
 #
 
-rebar:
-   @(test ! -e $(BASE_DIR)/support/rebar/rebar  \
-   echo == build rebar  \
-   cd $(BASE_DIR)/support/rebar  \
-   $(ESCRIPT) bootstrap || true)
-   @cp $(BASE_DIR)/support/rebar/rebar $(BASE_DIR)/rebar
+rebar: $(BASE_DIR)/rebar
+
+$(BASE_DIR)/rebar:
+   @echo == build rebar
+   @(cd $(BASE_DIR)/support/rebar  $(ESCRIPT) bootstrap)
+   @$(CP) $(BASE_DIR)/support/rebar/rebar $(BASE_DIR)/rebar
+   @$(CP) $(BASE_DIR)/support/rebar/rebar.cmd $(BASE_DIR)/rebar.cmd
 
 rebarclean:
@(cd $(BASE_DIR)/support/rebar  \
-   rm -rf rebar ebin/*.beam inttest/rt.work rt.work .test)
+   $(RM) rebar ebin/*.beam inttest/rt.work rt.work .test)
+   @$(RM) $(BASE_DIR)/rebar
 
 #
 # DOCS
@@ -75,38 +98,35 @@ SPHINXOPTS = -n -c $(DOC_SRCDIR) \
 $(DOC_SRCDIR)
 
 reldoc: reldocclean doc
-   mkdir -p $(DOC_RELDIR)
-   cp -r $(DOC_BUILDDIR)/html $(DOC_RELDIR)
-   cp -r $(DOC_BUILDDIR)/latex/CouchDB.pdf $(DOC_RELDIR)
-   cp -r $(DOC_BUILDDIR)/texinfo/CouchDB.info $(DOC_RELDIR)
+   $(MKDIR) $(DOC_RELDIR)
+   $(CP) $(DOC_BUILDDIR)/html $(DOC_RELDIR)
+   $(CP) $(DOC_BUILDDIR)/latex/CouchDB.pdf $(DOC_RELDIR)
+   $(CP) $(DOC_BUILDDIR)/texinfo/CouchDB.info $(DOC_RELDIR)
 
 doc:

couchdb commit: updated refs/heads/1994-merge-rcouch to 2e4ca0e

2014-04-18 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/1994-merge-rcouch 283a3b7f4 - 2e4ca0e4c


Ignore batch file copy on UNIX

COUCHDB-1994


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

Branch: refs/heads/1994-merge-rcouch
Commit: 2e4ca0e4c9efef014b59cfb846e2cefc75447536
Parents: 283a3b7
Author: Joan Touzet woh...@apache.org
Authored: Fri Apr 18 21:59:53 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Apr 18 21:59:53 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/2e4ca0e4/Makefile
--
diff --git a/Makefile b/Makefile
index cfed7ba..7412e25 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ $(BASE_DIR)/rebar:
@echo == build rebar
@(cd $(BASE_DIR)/support/rebar  $(ESCRIPT) bootstrap)
@$(CP) $(BASE_DIR)/support/rebar/rebar $(BASE_DIR)/rebar
-   @$(CP) $(BASE_DIR)/support/rebar/rebar.cmd $(BASE_DIR)/rebar.cmd
+   @-$(CP) $(BASE_DIR)/support/rebar/rebar.cmd $(BASE_DIR)/rebar.cmd
 
 rebarclean:
@(cd $(BASE_DIR)/support/rebar  \

couch-collate commit: updated refs/heads/1994-merge-rcouch to 3a8f260

2014-04-18 Thread wohali 
Repository: couchdb-couch-collate
Updated Branches:
  refs/heads/1994-merge-rcouch 985a7f80c - 3a8f260a2


Support Windows build, use official ICU src (for now)

COUCHDB-1994


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

Branch: refs/heads/1994-merge-rcouch
Commit: 3a8f260a246928e20048bcdbe69a078f1d306865
Parents: 985a7f8
Author: Joan Touzet woh...@apache.org
Authored: Fri Apr 18 22:31:03 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Apr 18 22:31:03 2014 -0400

--
 .gitattributes  |  2 ++
 .gitignore  |  3 ++
 build_icu.ps1   | 71 
 build_icu.sh|  2 +-
 rebar.config.script | 43 -
 5 files changed, 113 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/blob/3a8f260a/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..1135ec5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* -text
+

http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/blob/3a8f260a/.gitignore
--
diff --git a/.gitignore b/.gitignore
index eae0096..e08b336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ ebin
 t/*.beam
 .dists
 .libs
+*.pdb
+*~
+priv

http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/blob/3a8f260a/build_icu.ps1
--
diff --git a/build_icu.ps1 b/build_icu.ps1
new file mode 100644
index 000..465d756
--- /dev/null
+++ b/build_icu.ps1
@@ -0,0 +1,71 @@
+param([switch]$clean)
+
+$ICU_ZIP = icu4c-4_8_1-Win32-msvc10.zip
+$ICU_URL=http://download.icu-project.org/files/icu4c/4.8.1;
+
+$DISTDIR=${pwd}\.dists
+$STATICLIBS=${pwd}\.libs
+$ICUDIR=${STATICLIBS}\icu
+
+#
+# improved remove-item -recurse -force
+# thanks to http://serverfault.com/questions/199921/powershell-remove-force
+#
+function rmrf($directory = $(throw Required parameter missing)) {
+if ((test-path $directory) -and -not
+(gi $directory | ? { $_.PSIsContainer })) {
+throw (rmrf called on non-directory.);
+}
+
+$finished = $false;
+$attemptsLeft = 3;
+
+do {
+if (test-path $directory) {
+rm $directory -recurse -force 21 | out-null
+}
+if (test-path $directory) {
+Start-Sleep -Milliseconds 500
+$attemptsLeft = $attemptsLeft - 1
+} else {
+$finished = $true
+}
+} while (-not $finished -and $attemptsLeft -gt 0)
+
+if (test-path $directory) {
+throw (Unable to fully remove directory  + $directory)
+}
+}
+
+
+#
+# main
+#
+if ($clean -eq $true) {
+write-host == icu (clean)
+rmrf($STATICLIBS)
+rmrf($DISTDIR)
+} else {
+write-host == icu (binary-download)
+rmrf($STATICLIBS)
+rmrf($DISTDIR)
+md $STATICLIBS -ea silentlycontinue  $null
+md $DISTDIR -ea silentlycontinue  $null
+
+# download the zip
+$source = ${ICU_URL}/${ICU_ZIP}
+$dest = ${DISTDIR}\${ICU_ZIP}
+if (-not (test-path $dest)) {
+write-host == Fetch ${ICU_ZIP} to ${dest}
+$wc = New-Object System.Net.WebClient
+$wc.DownloadFile($source, $dest)
+}
+
+# unpack the zip
+$shell = new-object -com shell.application
+$zip = $shell.NameSpace($dest)
+foreach($item in $zip.items())
+{
+$shell.Namespace($STATICLIBS).copyhere($item)
+}
+}

http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/blob/3a8f260a/build_icu.sh
--
diff --git a/build_icu.sh b/build_icu.sh
index 04304e6..7c1e6db 100755
--- a/build_icu.sh
+++ b/build_icu.sh
@@ -20,7 +20,7 @@ DISTDIR=$CORE_TOP/.dists
 # icu sources
 ICU_VER=4.4.2
 ICU_DISTNAME=icu4c-4_4_2-src.tgz
-ICU_SITE=http://dl.refuge.io
+ICU_SITE=http://download.icu-project.org/files/icu4c/4.4.2
 ICUDIR=$STATICLIBS/icu
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate/blob/3a8f260a/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 3a52869..90f079f 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -42,10 +42,15 @@ IsDarwin = case os:type() of
 _ - false
 end,
 
+IsWindows = case os:type() of
+{win32, nt} - true;
+_ - false
+end,
+
 UseSystemIcu = IsDarwin andalso os:getenv(USE_STATIC_ICU) /= 1,

couch commit: updated refs/heads/1994-merge-rcouch to f979b74

2014-04-18 Thread wohali 
Repository: couchdb-couch
Updated Branches:
  refs/heads/1994-merge-rcouch f9e309519 - f979b74f5


Support Windows build, use official JS src (for now)


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

Branch: refs/heads/1994-merge-rcouch
Commit: f979b74f5cc1b5eff16a4bac0f825c51562852f1
Parents: f9e3095
Author: Joan Touzet woh...@apache.org
Authored: Fri Apr 18 22:38:13 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Apr 18 22:38:13 2014 -0400

--
 .gitattributes |  2 ++
 .gitignore |  2 ++
 build_spidermonkey.ps1 | 70 +
 build_spidermonkey.sh  |  6 ++--
 c_src/couch_js/http.c  |  4 ++-
 rebar.config.script| 32 +
 6 files changed, 107 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f979b74f/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..1135ec5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* -text
+

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f979b74f/.gitignore
--
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..8c21e0e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+c_src/couch_js/config.h
+*~

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f979b74f/build_spidermonkey.ps1
--
diff --git a/build_spidermonkey.ps1 b/build_spidermonkey.ps1
new file mode 100644
index 000..21c7aea
--- /dev/null
+++ b/build_spidermonkey.ps1
@@ -0,0 +1,70 @@
+param([switch]$clean)
+
+$JS_ZIP = js185-1.0.0-win32.zip
+$JS_URL=http://www.atypical.net/apache;
+
+$DISTDIR=${pwd}\.dists
+$JSLIBS=${pwd}\.libs\js
+
+#
+# improved remove-item -recurse -force
+# thanks to http://serverfault.com/questions/199921/powershell-remove-force
+#
+function rmrf($directory = $(throw Required parameter missing)) {
+if ((test-path $directory) -and -not
+(gi $directory | ? { $_.PSIsContainer })) {
+throw (rmrf called on non-directory.);
+}
+
+$finished = $false;
+$attemptsLeft = 3;
+
+do {
+if (test-path $directory) {
+rm $directory -recurse -force 21 | out-null
+}
+if (test-path $directory) {
+Start-Sleep -Milliseconds 500
+$attemptsLeft = $attemptsLeft - 1
+} else {
+$finished = $true
+}
+} while (-not $finished -and $attemptsLeft -gt 0)
+
+if (test-path $directory) {
+throw (Unable to fully remove directory  + $directory)
+}
+}
+
+
+#
+# main
+#
+if ($clean -eq $true) {
+write-host == spidermonkey (clean)
+rmrf($JSLIBS)
+rmrf($DISTDIR)
+} else {
+write-host == spidermonkey (binary-download)
+rmrf($JSLIBS)
+rmrf($DISTDIR)
+md $JSLIBS -ea silentlycontinue | out-null
+md $DISTDIR -ea silentlycontinue | out-null
+
+# download the zip
+$source = ${JS_URL}/${JS_ZIP}
+$dest = ${DISTDIR}\${JS_ZIP}
+if (-not (test-path $dest)) {
+write-host == Fetch ${JS_ZIP} to ${dest}
+$wc = New-Object System.Net.WebClient
+$wc.DownloadFile($source, $dest)
+}
+
+# unpack the zip
+$shell = new-object -com shell.application
+$zip = $shell.NameSpace($dest)
+foreach($item in $zip.items())
+{
+$shell.Namespace($JSLIBS).copyhere($item)
+}
+}

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f979b74f/build_spidermonkey.sh
--
diff --git a/build_spidermonkey.sh b/build_spidermonkey.sh
index 95a15dd..a1d4efc 100755
--- a/build_spidermonkey.sh
+++ b/build_spidermonkey.sh
@@ -20,13 +20,13 @@ DISTDIR=$CORE_TOP/.dists
 # nspr sources
 NSPR_VER=4.8.8
 NSPR_DISTNAME=nspr-$NSPR_VER.tar.gz
-NSPR_SITE=http://dl.refuge.io
+NSPR_SITE=http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.8/src/
 
 # spidermonkey js sources
 JS_VER=185-1.0.0
 JS_REALVER=1.8.5
 JS_DISTNAME=js$JS_VER.tar.gz
-JS_SITE=http://dl.refuge.io
+JS_SITE=http://ftp.mozilla.org/pub/mozilla.org/js
 JSDIR=$STATICLIBS/js-$JS_REALVER
 JS_LIBDIR=$STATICLIBS/js/lib
 JS_INCDIR=$STATICLIBS/js/include
@@ -155,7 +155,7 @@ build_js()
 cp $JSDIR/js/src/*.h $JS_INCDIR
 cp $JSDIR/js/src/*.tbl $JS_INCDIR
 cp $JSDIR/js/src/libjs_static.a $JS_LIBDIR
-}
+
 
 
 do_setup()

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f979b74f/c_src/couch_js/http.c

couch commit: updated refs/heads/1994-merge-rcouch to 5eb93a4

2014-04-18 Thread wohali 
Repository: couchdb-couch
Updated Branches:
  refs/heads/1994-merge-rcouch f979b74f5 - 5eb93a4f2


Missing }


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

Branch: refs/heads/1994-merge-rcouch
Commit: 5eb93a4f2b3eabb0bbd071b2a33184765b461e19
Parents: f979b74
Author: Joan Touzet woh...@apache.org
Authored: Fri Apr 18 22:44:19 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Apr 18 22:44:19 2014 -0400

--
 build_spidermonkey.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5eb93a4f/build_spidermonkey.sh
--
diff --git a/build_spidermonkey.sh b/build_spidermonkey.sh
index a1d4efc..68dc813 100755
--- a/build_spidermonkey.sh
+++ b/build_spidermonkey.sh
@@ -155,7 +155,7 @@ build_js()
 cp $JSDIR/js/src/*.h $JS_INCDIR
 cp $JSDIR/js/src/*.tbl $JS_INCDIR
 cp $JSDIR/js/src/libjs_static.a $JS_LIBDIR
-
+}
 
 
 do_setup()

couchdb commit: updated refs/heads/master to e348d4f

2014-04-20 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master fdb2188af - e348d4f2d


When backgrounding couchdb, close stdout/stderr

COUCHDB-2220
COUCHDB-1669


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

Branch: refs/heads/master
Commit: e348d4f2da082cee52d11efc6fbc94f1d8a047c9
Parents: fdb2188
Author: Joan Touzet woh...@apache.org
Authored: Mon Apr 21 01:30:01 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Mon Apr 21 01:30:01 2014 -0400

--
 bin/couchdb.tpl.in | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e348d4f2/bin/couchdb.tpl.in
--
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 538ebcb..f2027f1 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -270,6 +270,9 @@ start_couchdb () {
 echo Apache CouchDB has started, time to relax.
 else
 if test $RECURSED = true; then
+# close stdout / stderr
+exec 1-
+exec 2-
 while true; do
 export HEART_COMMAND
 export HEART_BEAT_TIMEOUT

couchdb commit: updated refs/heads/master to 70e9d57

2014-09-06 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master f8a6765fd - 70e9d571a


Travis: Drop R15 build, add 17.1


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

Branch: refs/heads/master
Commit: 70e9d571a35bcfb9fe0120fed07a930c388ba88b
Parents: f8a6765
Author: Joan Touzet woh...@apache.org
Authored: Sat Sep 6 20:01:09 2014 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Sat Sep 6 20:01:09 2014 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/70e9d571/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index c9fd820..10dbfad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,9 @@ script:
- grunt test
 language: erlang
 otp_release:
+   - 17.1
- 17.0
- R16B03-1
-   - R15B03
- R14B04
 git:
   depth: 10

svn commit: r1629337 - /couchdb/site/index.html

2014-10-03 Thread wohali 
Author: wohali
Date: Fri Oct  3 23:47:03 2014
New Revision: 1629337

URL: http://svn.apache.org/r1629337
Log:
Add a JIRA Submit a Bug button

Modified:
couchdb/site/index.html

Modified: couchdb/site/index.html
URL: 
http://svn.apache.org/viewvc/couchdb/site/index.html?rev=1629337r1=1629336r2=1629337view=diff
==
--- couchdb/site/index.html (original)
+++ couchdb/site/index.html Fri Oct  3 23:47:03 2014
@@ -377,7 +377,8 @@ This fabulous linen texture was integrat
 var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
 })();
   /script
-
+  script type=text/javascript 
src=https://issues.apache.org/jira/s/1c67ff5e37d44b99a6a3140ab88552c8-T/en_UK1zkmuk/6332/7/1.4.15/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?locale=en-UKcollectorId=c4088f46;/script
+  
 /body
 
 /html

fauxton commit: updated refs/heads/master to 873f947

2015-02-09 Thread wohali 
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 6c6fcaba5 - 873f94790


Reduce spam to #couchdb-dev IRC


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

Branch: refs/heads/master
Commit: 873f947903b0d16dc6b865df381d6f40cda53d4b
Parents: 6c6fcab
Author: Joan Touzet woh...@apache.org
Authored: Mon Feb 9 18:06:53 2015 -0500
Committer: Joan Touzet woh...@apache.org
Committed: Mon Feb 9 18:06:53 2015 -0500

--
 .travis.yml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/873f9479/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index cd33b4d..21e7bbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,5 +25,8 @@ notifications:
   irc:
 channels:
   - chat.freenode.net#couchdb-dev
+template:
+  - %{repository}#%{build_number} (%{branch} - %{commit} : %{author}): 
%{message} Amazing details: %{build_url}
+skip_join: true
 on_success: never
-on_failure: always
+on_failure: change

couchdb commit: updated refs/heads/master to ce2c357

2015-06-26 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 1ef7182ac - ce2c357fb


Adding references for FreeBSD, Fauxton, minor cleanup


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

Branch: refs/heads/master
Commit: ce2c357fbb3402b79c7a7c01dcc40b1f2ff55487
Parents: 1ef7182
Author: Joan Touzet woh...@apache.org
Authored: Fri Jun 26 17:58:59 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Jun 26 17:58:59 2015 -0400

--
 INSTALL.Unix | 56 ---
 README-DEV   | 42 ++---
 2 files changed, 38 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ce2c357f/INSTALL.Unix
--
diff --git a/INSTALL.Unix b/INSTALL.Unix
index f662e63..8b4b53d 100644
--- a/INSTALL.Unix
+++ b/INSTALL.Unix
@@ -61,17 +61,10 @@ Debian-based Systems
 
 You can install the dependencies by running:
 
-sudo apt-get install build-essential
-sudo apt-get install erlang-base-hipe
-sudo apt-get install erlang-dev
-sudo apt-get install erlang-manpages
-sudo apt-get install erlang-eunit
-sudo apt-get install erlang-nox
-sudo apt-get install libicu-dev
-sudo apt-get install libmozjs185-dev
-sudo apt-get install libcurl4-openssl-dev
-sudo apt-get install pkg-config
-sudo apt-get install rebar
+sudo apt-get install build-essential erlang-base-hipe \
+erlang-dev erlang-manpages erlang-eunit erlang-nox \
+libicu-dev libmozjs185-dev libcurl4-openssl-dev \
+pkg-config rebar
 
 There are lots of Erlang packages. If there is a problem with your
 install, try a different mix. There is more information on the
@@ -95,21 +88,10 @@ RedHat-based (Fedora, Centos, RHEL) Systems
 
 You can install the dependencies by running:
 
-sudo yum install autoconf
-sudo yum install autoconf-archive
-sudo yum install automake
-sudo yum install curl-devel
-sudo yum install erlang-asn1
-sudo yum install erlang-erts
-sudo yum install erlang-eunit
-sudo yum install erlang-os_mon
-sudo yum install erlang-xmerl
-sudo yum install erlang-rebar
-sudo yum install help2man
-sudo yum install js-devel
-sudo yum install libicu-devel
-sudo yum install libtool
-sudo yum install perl-Test-Harness
+sudo yum install autoconf autoconf-archive automake \
+curl-devel erlang-asn1 erlang-erts erlang-eunit \
+erlang-os_mon erlang-xmerl erlang-rebar help2man \
+js-devel libicu-devel libtool perl-Test-Harness
 
 While CouchDB builds against the default js-devel-1.7.0 included in
 some distributions, it's recommended to use a more recent
@@ -125,16 +107,8 @@ the Command Line Tools:
 
 You can then install the other dependencies by running:
 
-brew install autoconf
-brew install autoconf-archive
-brew install automake
-brew install libtool
-brew install erlang
-brew install icu4c
-brew install spidermonkey
-brew install curl
-brew install pkg-config
-brew install rebar
+brew install autoconf autoconf-archive automake libtool \
+erlang icu4c spidermonkey curl pkg-config rebar
 
 You will need Homebrew installed to use the `brew` command.
 
@@ -148,6 +122,16 @@ a segmentation fault or a bus error, you will need to 
install your own
 version of OpenSSL. See the troubleshooting guide, mentioned above,
 for more information.
 
+FreeBSD
+---
+
+FreeBSD requires the use of GNU Make. Where `make` is specified in this
+documentation, substitute `gmake`.
+
+You can install this by running:
+
+pkg install gmake
+
 Installing
 --
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ce2c357f/README-DEV
--
diff --git a/README-DEV b/README-DEV
index 94bb683..997e3db 100644
--- a/README-DEV
+++ b/README-DEV
@@ -39,6 +39,11 @@ However, you do not need them if:
  * You are building from a distribution archive, or
  * You don't care about building the documentation
 
+If you intend to build Fauxton, you will also need to install its
+dependencies. After running ./configure to download all of the
+dependent repositories, you can read about required dependencies in
+`src/fauxton/readme.md`. Typically, installing npm and node.js are
+sufficient to enable a Fauxton build.
 
 Here is a list of *optional* dependencies for various operating systems.
 Installation will be easiest, when you install them all.
@@ -46,36 +51,21 @@ Installation will be easiest, when you install them all.

couchdb commit: updated refs/heads/master to a1ecde1

2015-06-26 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master ce2c357fb - a1ecde1eb


Add Markdown extension to relevant root-directory files


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

Branch: refs/heads/master
Commit: a1ecde1ebe1a4c5bda0dedc28b905546bea4ea3a
Parents: ce2c357
Author: Joan Touzet woh...@apache.org
Authored: Fri Jun 26 18:06:44 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Jun 26 18:06:44 2015 -0400

--
 BUGS   |   8 --
 BUGS.md|   8 ++
 COMMITTERS |  50 
 COMMITTERS.md  |  50 
 INSTALL.Unix   | 322 
 INSTALL.Unix.md| 322 
 INSTALL.Windows| 204 --
 INSTALL.Windows.md | 204 ++
 README-DEV | 194 -
 README-DEV.md  | 194 +
 license.skip   |  15 ++-
 11 files changed, 787 insertions(+), 784 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/BUGS
--
diff --git a/BUGS b/BUGS
deleted file mode 100644
index 1bdc478..000
--- a/BUGS
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache CouchDB BUGS
-===
-
-Visit our issue tracker:
-
-https://issues.apache.org/jira/browse/CouchDB
-
-You can use this to report bugs, request features, or suggest enhancements.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/BUGS.md
--
diff --git a/BUGS.md b/BUGS.md
new file mode 100644
index 000..1bdc478
--- /dev/null
+++ b/BUGS.md
@@ -0,0 +1,8 @@
+Apache CouchDB BUGS
+===
+
+Visit our issue tracker:
+
+https://issues.apache.org/jira/browse/CouchDB
+
+You can use this to report bugs, request features, or suggest enhancements.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/COMMITTERS
--
diff --git a/COMMITTERS b/COMMITTERS
deleted file mode 100644
index 6030e5b..000
--- a/COMMITTERS
+++ /dev/null
@@ -1,50 +0,0 @@
-Apache CouchDB COMMITTERS
-=
-
-Committers are given a binding vote in certain project decsions, as well as
-write access to public project infrastructure. The following people were
-elected as a committer in recognition of their commitment to the project. We
-mean this in the sense of being loyal to the project and its interests.
-
- * Damien Katz dam...@apache.org
- * Jan Lehnardt j...@apache.org
- * Noah Slater nsla...@apache.org
- * Christopher Lenz cml...@apache.org
- * J. Chris Anderson jch...@apache.org
- * Paul Joseph Davis dav...@apache.org
- * Adam Kocoloski kocol...@apache.org
- * Jason Davies jasondav...@apache.org
- * Mark Hammond mhamm...@apache.org
- * Benoît Chesneau beno...@apache.org
- * Filipe Manana fdman...@apache.org
- * Robert Newson rnew...@apache.org
- * Randall Leeds rand...@apache.org
- * Bob Dionne bitdid...@apache.org
- * Dave Cottlehuber d...@apache.org
- * Jason Smith j...@apache.org
- * Joan Touzet woh...@apache.org
- * Dale Harvey d...@apache.org
- * Dirkjan Ochtman d...@apache.org
- * Alexander Shorin kxe...@apache.org
- * Garren Smith gar...@apache.org
- * Sue Lockwood deathb...@apache.org
- * Andy Wenk andyw...@apache.org
- * Klaus Trainer klaus_trai...@apache.org
- * Benjamin Young bigblue...@apache.org
- * Robert Kowalski robertkowal...@apache.org
- * Max Thayer garba...@apache.org
- * Gianugo Rabellino gian...@apache.org
- * Jenn Schiffer j...@apache.org
- * Lena Reinhard l...@apache.org
- * Simon Metson met...@apache.org
- * Mike Wallace mikewall...@apache.org
- * Nick North nickno...@apache.org
- * Ryan Ramage ryanram...@apache.org
- * Sebastian Rothbucher sebastia...@apache.org
- * Ted Leung t...@apache.org
- * Wendall Cada wenda...@apache.org
- * Benjamin Bastian bbast...@apache.org
- * Ben Keen benk...@apache.org
- * Maria Andersson m...@apache.org
-
-For a list of other credits see the `THANKS` file.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1ecde1e/COMMITTERS.md
--
diff --git a/COMMITTERS.md b/COMMITTERS.md
new file mode 100644
index 000..6030e5b
--- /dev/null
+++ b/COMMITTERS.md
@@ -0,0 +1,50 @@
+Apache CouchDB COMMITTERS
+=
+
+Committers are given a binding vote in certain project decsions, as well as
+write access to public project infrastructure. The following people were
+elected as a

[GitHub] couchdb-khash pull request: Support Windows build

2015-08-10 Thread wohali 
Github user wohali closed the pull request at:

https://github.com/apache/couchdb-khash/pull/4


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] couchdb-khash pull request: Remove the use of make_hash2

2015-07-14 Thread wohali 
Github user wohali commented on the pull request:

https://github.com/apache/couchdb-khash/pull/3#issuecomment-121153808
  
I am in transit Tuesday but will test this Wednesday on Windows for a 
build. Thanks for helping out!


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] couchdb-khash pull request: Remove the use of make_hash2

2015-07-16 Thread wohali 
Github user wohali commented on a diff in the pull request:

https://github.com/apache/couchdb-khash/pull/3#discussion_r34838013
  
--- Diff: c_src/khash.c ---
@@ -278,9 +272,10 @@ khash_clear(ErlNifEnv* env, int argc, const 
ERL_NIF_TERM argv[])
 
 
 static inline hnode_t*
-khash_lookup_int(ErlNifEnv* env, ERL_NIF_TERM key, khash_t* khash)
+khash_lookup_int(ErlNifEnv* env, uint32_t hv, ERL_NIF_TERM key, khash_t* 
khash)
--- End diff --

Need to

#include stdint.h

for this to work on Windows.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[2/2] couchdb-b64url git commit: Merge branch 'windows_support'

2015-07-16 Thread wohali 
Merge branch 'windows_support'


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

Branch: refs/heads/master
Commit: 4ee0dcc0bc68dddbd6394f133f64fc57be2d2ad4
Parents: 30a50f2 3df89ea
Author: Joan Touzet woh...@apache.org
Authored: Fri Jul 17 00:14:14 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Jul 17 00:14:14 2015 -0400

--
 .gitignore |  4 +++-
 c_src/b64url.c | 24 +++-
 rebar.config   |  4 +++-
 3 files changed, 21 insertions(+), 11 deletions(-)
--

[1/2] couchdb-b64url git commit: Support Windows build target

2015-07-16 Thread wohali 
Repository: couchdb-b64url
Updated Branches:
  refs/heads/master 30a50f268 - 4ee0dcc0b


Support Windows build target


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

Branch: refs/heads/master
Commit: 3df89ea8c474d0adda833422c1c72fbea9fa98b9
Parents: 30a50f2
Author: Joan Touzet woh...@apache.org
Authored: Sat Jul 11 19:24:23 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Jul 17 00:13:45 2015 -0400

--
 .gitignore |  4 +++-
 c_src/b64url.c | 24 +++-
 rebar.config   |  4 +++-
 3 files changed, 21 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-b64url/blob/3df89ea8/.gitignore
--
diff --git a/.gitignore b/.gitignore
index d1356fa..24f9e66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .eunit/
 c_src/*.o
 ebin/
-priv/*.so
+priv/
+.rebar/
+vc110.pdb

http://git-wip-us.apache.org/repos/asf/couchdb-b64url/blob/3df89ea8/c_src/b64url.c
--
diff --git a/c_src/b64url.c b/c_src/b64url.c
index 074d9a0..d9e2e04 100644
--- a/c_src/b64url.c
+++ b/c_src/b64url.c
@@ -15,6 +15,12 @@
 
 #include erl_nif.h
 
+#ifdef _WIN32
+#define INLINE __inline
+#else
+#define INLINE inline
+#endif
+
 
 typedef ERL_NIF_TERM ENTERM;
 
@@ -93,7 +99,7 @@ const unsigned char B64URL_A2B[256] = {
 
 #define BYTES_PER_PERCENT 64
 
-static inline int
+static INLINE int
 do_consume_timeslice(ErlNifEnv* env) {
 #if(ERL_NIF_MAJOR_VERSION = 2  ERL_NIF_MINOR_VERSION = 4)
 return enif_consume_timeslice(env, 1);
@@ -103,7 +109,7 @@ do_consume_timeslice(ErlNifEnv* env) {
 }
 
 
-static inline ENTERM
+static INLINE ENTERM
 make_atom(ErlNifEnv* env, const char* name)
 {
 ENTERM ret;
@@ -114,21 +120,21 @@ make_atom(ErlNifEnv* env, const char* name)
 }
 
 
-static inline ENTERM
+static INLINE ENTERM
 make_ok(ErlNifEnv* env, b64url_priv* priv, ENTERM value)
 {
 return enif_make_tuple2(env, priv-atom_ok, value);
 }
 
 
-static inline ENTERM
+static INLINE ENTERM
 make_error(ErlNifEnv* env, b64url_priv* priv, ENTERM value)
 {
 return enif_make_tuple2(env, priv-atom_error, value);
 }
 
 
-static inline ENTERM
+static INLINE ENTERM
 make_bad_block(ErlNifEnv* env, b64url_priv* priv, size_t pos)
 {
 ENTERM pterm = enif_make_uint64(env, pos);
@@ -136,14 +142,14 @@ make_bad_block(ErlNifEnv* env, b64url_priv* priv, size_t 
pos)
 }
 
 
-static inline ENTERM
+static INLINE ENTERM
 make_partial(ErlNifEnv* env, b64url_priv* priv, ENTERM value)
 {
 return enif_make_tuple2(env, priv-atom_partial, value);
 }
 
 
-static inline int
+static INLINE int
 check_pid(ErlNifEnv* env, b64url_st* st)
 {
 ErlNifPid self_pid;
@@ -304,7 +310,7 @@ unload(ErlNifEnv* env, void* priv)
 }
 
 
-static inline b64url_status
+static INLINE b64url_status
 b64url_encode(ErlNifEnv* env, ErlNifBinary* src, b64url_st* st)
 {
 size_t chunk_start = st-si;
@@ -442,7 +448,7 @@ b64url_encode_cont(ErlNifEnv* env, int argc, const ENTERM 
argv[])
 }
 
 
-static inline b64url_status
+static INLINE b64url_status
 b64url_decode(ErlNifEnv* env, ErlNifBinary* src, b64url_st* st, ENTERM* ret)
 {
 b64url_priv* priv = (b64url_priv*) enif_priv_data(env);

http://git-wip-us.apache.org/repos/asf/couchdb-b64url/blob/3df89ea8/rebar.config
--
diff --git a/rebar.config b/rebar.config
index 534c049..4732af8 100644
--- a/rebar.config
+++ b/rebar.config
@@ -9,5 +9,7 @@
 % {.*, CFLAGS, $CFLAGS -g -Wall -Werror -fPIC}
 
 % Production compilation
-{.*, CFLAGS, $CFLAGS -Wall -Werror -DNDEBUG -O3}
+{(linux|solaris|darwin|freebsd), CFLAGS, $CFLAGS -Wall -Werror 
-DNDEBUG -O3},
+{win32, CFLAGS, $CFLAGS /O2 /DNDEBUG /Wall}
+
 ]}.

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

2015-07-16 Thread wohali 
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 3a26ea1ba - 8b4af2160


Support Windows build target


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

Branch: refs/heads/master
Commit: c76a78b492b9a3fb33f4d72d09c950f692d2db9a
Parents: 3a26ea1
Author: Joan Touzet woh...@apache.org
Authored: Sat Jul 11 19:38:38 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Jul 17 00:17:46 2015 -0400

--
 .gitignore  |  3 +++
 rebar.config.script | 10 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c76a78b4/.gitignore
--
diff --git a/.gitignore b/.gitignore
index ee4059b..c1a4701 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@ ebin/
 priv/couch_js/config.h
 priv/couchjs
 priv/couchspawnkillable
+priv/*.exp
+priv/*.lib
+vc120.pdb
 
 .rebar/
 .eunit

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c76a78b4/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 34e645c..6d4968d 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -59,6 +59,7 @@ ConfigSrc = [[#define , K,  , V, $\n] || {K, V} - 
ConfigH],
 ConfigBin = iolist_to_binary(ConfigSrc),
 ok = CopyIfDifferent(CouchJSConfig, ConfigBin),
 
+%% TODO support curl on Windows
 {JS_CFLAGS, JS_LDFLAGS} = case lists:keyfind(with_curl, 1, CouchConfig) of
 {with_curl, true} -
 {-DHAVE_CURL , -DHAVE_CURL -lmozjs185 -lcurl};
@@ -76,6 +77,9 @@ IcuDarwinEnv = [{CFLAGS, -DXP_UNIX 
-I/usr/local/opt/icu4c/include},
 {LDFLAGS, -L/usr/local/opt/icu4c/lib}],
 IcuBsdEnv = [{CFLAGS, -DXP_UNIX -I/usr/local/include},
  {LDFLAGS, -L/usr/local/lib}],
+IcuWinEnv = [{CFLAGS, /DXP_WIN /IC:\\relax\\icu\\include},
+ {LDFLAGS, /LIBPATH:C:\\relax\\icu\\lib64 icuin.lib icudt.lib 
icuuc.lib}],
+
 ComparePath = priv/couch_ejson_compare.so,
 CompareSrc = [priv/couch_ejson_compare/*.c],
 
@@ -84,17 +88,17 @@ BaseSpecs = [
 {darwin, CouchJSPath, CouchJSSrc, [{env, [{CFLAGS, JS_CFLAGS ++ 
-DXP_UNIX -I/usr/local/include/js}, {LDFLAGS, JS_LDFLAGS ++  
-L/usr/local/lib}]}]},
 {linux,  CouchJSPath, CouchJSSrc, [{env, [{CFLAGS, JS_CFLAGS ++ 
-DXP_UNIX -I/usr/include/js}, {LDFLAGS, JS_LDFLAGS ++  -lm}]}]},
 {bsd,   CouchJSPath, CouchJSSrc, [{env, [{CFLAGS, JS_CFLAGS ++ 
-DXP_UNIX -I/usr/local/include/js}, {LDFLAGS, JS_LDFLAGS ++  
-L/usr/local/lib -lm}]}]},
-{win32,  CouchJSPath, CouchJSSrc, [{env, [{CFLAGS, JS_CFLAGS ++ 
-DXP_WIN -I/usr/include/js}, {LDFLAGS, JS_LDFLAGS}]}]},
+{win32,  CouchJSPath, CouchJSSrc, [{env, [{CFLAGS, /DXP_WIN 
/IC:\\relax\\js-1.8.5\\js\\src}, {LDFLAGS, 
/LIBPATH:C:\\relax\\js-1.8.5\\js\\src mozjs185-1.0.lib}]}]},
 % ICU
 {darwin, IcuPath, IcuSrc, [{env, IcuEnv ++ IcuDarwinEnv}]},
 {linux,  IcuPath, IcuSrc, [{env, IcuEnv}]},
 {bsd,   IcuPath, IcuSrc, [{env, IcuEnv ++ IcuBsdEnv}]},
-{win32,  IcuPath, IcuSrc, [{env, IcuEnv}]},
+{win32,  IcuPath, IcuSrc, [{env, IcuEnv ++ IcuWinEnv}]},
 % ejson_compare
 {darwin, ComparePath, CompareSrc, [{env, IcuEnv ++ IcuDarwinEnv}]},
 {linux,  ComparePath, CompareSrc, [{env, IcuEnv}]},
 {bsd,   ComparePath, CompareSrc, [{env, IcuEnv ++ IcuBsdEnv}]},
-{win32,  ComparePath, CompareSrc, [{env, IcuEnv}]}
+{win32,  ComparePath, CompareSrc, [{env, IcuEnv ++ IcuWinEnv}]}
 ],
 
 SpawnSpec = [

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

2015-07-16 Thread wohali 
Merge branch 'windows_support'


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

Branch: refs/heads/master
Commit: 8b4af2160afcad0ffcc895cf2b2f19f9dc171a5d
Parents: 3a26ea1 c76a78b
Author: Joan Touzet woh...@apache.org
Authored: Fri Jul 17 00:18:02 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Fri Jul 17 00:18:02 2015 -0400

--
 .gitignore  |  3 +++
 rebar.config.script | 10 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)
--

[GitHub] couchdb-khash pull request: Support Windows build

2015-07-16 Thread wohali 
GitHub user wohali opened a pull request:

https://github.com/apache/couchdb-khash/pull/4

Support Windows build



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/wohali/couchdb-khash windows-support

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/couchdb-khash/pull/4.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #4


commit 97135e303749b1729f193936412dbab1b24ee612
Author: Joan Touzet woh...@apache.org
Date:   2015-07-16T23:03:57Z

Support Windows build




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] couchdb-khash pull request: Remove the use of make_hash2

2015-07-16 Thread wohali 
Github user wohali commented on the pull request:

https://github.com/apache/couchdb-khash/pull/3#issuecomment-122108235
  
Failure. From node1.log under dev\run:


...
2015-07-16 17:35:06.887 [info] Undefined 0.7.0 Application oauth started 
on node 'node1@127.0.0.1'
2015-07-16 17:35:06.887 [info] Undefined 0.7.0 Application b64url started 
on node 'node1@127.0.0.1'
2015-07-16 17:35:06.887 [info] Undefined 0.7.0 Application khash started 
on node 'node1@127.0.0.1'
2015-07-16 17:35:06.894 [error] Undefined 0.142.0 The on_load function 
for module khash returned {error,{bad_lib,Function not found 
khash:lookup_int/3}}
2015-07-16 17:35:06.894 [error] Undefined 0.142.0 The on_load function 
for module khash returned {error,{bad_lib,Function not found 
khash:lookup_int/3}}
{init terminating in do_boot,{{error,{{shutdown,{fa2015-07-16 
17:35:06.894 [info] Undefined 0.93.0 alarm_handler: 
{set,{{disk_almost_full,C:\\},[]}}

iled_to_start_child,couch_event_server,{undef,[{khash,new,[],[]},{couch_event_server,init,1,[{file,src/couch_event_server.2015-07-16
 17:35:06.894 [info] Undefined 0.93.0 alarm_handler: 
{set,{{disk_almost_full,G:\\},[]}}

erl},{line,46}]},{gen_server,init_it,6,[{file,gen_server.erl},{line,306}]},{proc_lib,2015-07-16
 17:35:06.894 [error] Undefined 0.140.0 CRASH REPORT Process 0.140.0 with 0 
neighbours exited with reason: call to undefined function khash:new() in 
gen_server:init_it/6 line 330



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] couchdb-khash pull request: Remove the use of make_hash2

2015-07-16 Thread wohali 
Github user wohali commented on the pull request:

https://github.com/apache/couchdb-khash/pull/3#issuecomment-122120581
  
If you add the #include line, +1 :) Other changes are required for a 
Windows build that I can land after this.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[1/2] couchdb commit: updated refs/heads/master to 8059f09

2015-07-11 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 51b98a4a0 - 8059f09dc


First version of Windows configure script


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

Branch: refs/heads/master
Commit: a0c771cc41157004d7516f0b5495436c238106ef
Parents: bab44b8
Author: Joan Touzet woh...@apache.org
Authored: Sat Jul 11 19:33:57 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Sat Jul 11 19:33:57 2015 -0400

--
 configure.ps1 | 201 +
 1 file changed, 201 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a0c771cc/configure.ps1
--
diff --git a/configure.ps1 b/configure.ps1
new file mode 100644
index 000..75a6d17
--- /dev/null
+++ b/configure.ps1
@@ -0,0 +1,201 @@
+#
+.SYNOPSIS
+Configures CouchDB for building.
+.DESCRIPTION
+This command is responsible for generating the build
+system for Apache CouchDB.
+
+  -WithCurl  request that couchjs is linked to cURL (default 
false)
+  -DisableFauxtonrequest build process skip building Fauxton 
(default false)
+  -DisableDocs   request build process skip building documentation 
(default false)
+  -SkipDeps  do not update Erlang dependencies (default false)
+  -CouchDBUser USER  set the username to run as (defaults to current 
user)
+
+  Installation directories:
+  -Prefix PREFIX install architecture-independent files in PREFIX
+   [C:\Program Files\Apache\CouchDB]
+  -ExecPrefix EPREFIXinstall architecture-dependent files in EPREFIX
+   [same as PREFIX]
+
+  Fine tuning of the installation directories:
+  -BinDir DIR   user executables [EPREFIX\bin]
+  -LibexecDir DIR   program executables [EPREFIX\libexec]
+  -LibDir DIR   object code libraries [EPREFIX\lib]
+  -SysconfDir DIR   read-only single-machine data [PREFIX\etc]
+  -DataRootDir DIR  read-only arch.-independent data root 
[PREFIX\share]
+  -LocalStateDir DIRmodifiable single-machine data [PREFIX\var]
+  -RunStateDir DIR  modifiable single-machine runstate data 
[LOCALSTATEDIR\run]
+  -DatabaseDir DIR  specify the data directory [LOCALSTATEDIR\lib]
+  -ViewindexDir DIR specify the view directory [LOCALSTATEDIR\lib]
+  -LogDir DIR   specify the log directory [LOCALSTATEDIR\log]
+  -DataDir DIR  read-only architecture-independent data 
[DATAROOTDIR]
+  -InfoDir DIR  info documentation [DATAROOTDIR\info]
+  -ManDir DIR   man documentation [DATAROOTDIR\man]
+  -DocDir DIR   documentation root [DATAROOTDIR\doc\apache-couchdb]
+  -HTMLDir DIR  html documentation [DOCDIR\html]
+  -PDFDir DIR   pdf documentation [DOCDIR\pdf]
+.LINK
+http://couchdb.apache.org/
+#
+
+#REQUIRES -Version 2.0
+[cmdletbinding()]
+
+Param(
+[switch]$Test = $false,
+[switch]$WithCurl = $false, # request that couchjs is linked to cURL 
(default false)
+[switch]$DisableFauxton = $false, # do not build Fauxton
+[switch]$DisableDocs = $false, # do not build any documentation or manpages
+[switch]$SkipDeps = $false, # do not update erlang dependencies
+
+[ValidateNotNullOrEmpty()]
+[string]$CouchDBUser = [Environment]::UserName, # set the username to run 
as (defaults to current user)
+[ValidateNotNullOrEmpty()]
+[string]$Prefix = C:\Program Files\Apache\CouchDB, # install 
architecture-independent file location (default C:\Program Files\Apache\CouchDB)
+[ValidateNotNullOrEmpty()]
+[string]$ExecPrefix = $Prefix, # install architecture-dependent file 
location (default C:\Program Files\Apache\CouchDB)
+[ValidateNotNullOrEmpty()]
+[string]$BinDir = $ExecPrefix\bin, # user executable file location 
(default $ExecPrefix\bin)
+[ValidateNotNullOrEmpty()]
+[string]$LibExecDir = $ExecPrefix\libexec, # user executable file 
location (default $ExecPrefix\libexec)
+[ValidateNotNullOrEmpty()]
+[string]$LibDir = $ExecPrefix\lib, # object code libraries (default 
$ExecPrefix\lib)
+[ValidateNotNullOrEmpty()]
+
+[Alias(EtcDir)]
+[string]$SysConfDir = $Prefix\etc, # read-only single-machine data 
(default $Prefix\etc)
+[ValidateNotNullOrEmpty()]
+[string]$DataRootDir = $Prefix\share, # read-only arch.-independent data 
root (default $Prefix\share)
+
+[ValidateNotNullOrEmpty()]
+[string]$LocalStateDir = $Prefix\var, # modifiable single-machine

[2/2] couchdb commit: updated refs/heads/master to 8059f09

2015-07-11 Thread wohali 
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/couchdb


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

Branch: refs/heads/master
Commit: 8059f09dc0fedfdd0821b860448b52cb23038e29
Parents: a0c771c 51b98a4
Author: Joan Touzet woh...@apache.org
Authored: Sat Jul 11 19:34:19 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Sat Jul 11 19:34:19 2015 -0400

--
 dev/run | 2 +-
 rebar.config.script | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

jiffy commit: updated refs/heads/master to cdcf677

2015-08-27 Thread wohali 
Repository: couchdb-jiffy
Updated Branches:
  refs/heads/master ef77de4aa - cdcf6772a


fix Windows compile options


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

Branch: refs/heads/master
Commit: cdcf6772a0c6110910d10953509f2339e58fb036
Parents: ef77de4
Author: Joan Touzet woh...@apache.org
Authored: Thu Aug 27 13:53:43 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Thu Aug 27 13:53:43 2015 -0400

--
 rebar.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/cdcf6772/rebar.config
--
diff --git a/rebar.config b/rebar.config
index 76c5806..d458fd7 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,8 +24,8 @@
 {darwin10.*-32$, LDFLAGS, -arch i386},
 
 %% This will merge into basho/rebar/rebar.config eventually
-{win32, CFLAGS, /Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS},
-{win32, CXXFLAGS, -g -Wall -O3}
+{win32, CFLAGS, /Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS /Ic_src},
+{win32, CXXFLAGS, $CFLAGS /O2 /DNDEBUG /Wall /Ic_src}
 ]}.
 
 {erl_opts, [

jiffy commit: updated refs/heads/master to ea19c41

2015-08-27 Thread wohali 
Repository: couchdb-jiffy
Updated Branches:
  refs/heads/master cdcf6772a - ea19c417f


Reduce C++ flags to -O2 to fix gcc5 build


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

Branch: refs/heads/master
Commit: ea19c417f9fd52fa3f7ef2d378735e5532c59b29
Parents: cdcf677
Author: Joan Touzet woh...@apache.org
Authored: Thu Aug 27 14:25:54 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Thu Aug 27 14:25:54 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/ea19c417/rebar.config
--
diff --git a/rebar.config b/rebar.config
index d458fd7..cf589ba 100644
--- a/rebar.config
+++ b/rebar.config
@@ -10,7 +10,7 @@
 {(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin),
 CFLAGS, $CFLAGS -Ic_src/ -g -Wall -Werror -O3 
-fno-strict-aliasing},
 {(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin),
-CXXFLAGS, $CXXFLAGS -Ic_src/ -g -Wall -Werror -O3},
+CXXFLAGS, $CXXFLAGS -Ic_src/ -g -Wall -Werror -O2},
 
 {(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin),
 LDFLAGS, $LDFLAGS -lstdc++},

couchdb commit: updated refs/heads/master to bac7039

2015-08-29 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 999f71025 - bac703989


Windows fixes


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

Branch: refs/heads/master
Commit: bac7039899fb8dee72ab183896fc6391e1c394b4
Parents: 999f710
Author: Joan Touzet woh...@apache.org
Authored: Sat Aug 29 19:38:38 2015 -0400
Committer: Joan Touzet woh...@apache.org
Committed: Sat Aug 29 19:39:13 2015 -0400

--
 dev/run | 43 +--
 1 file changed, 25 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/bac70398/dev/run
--
diff --git a/dev/run b/dev/run
index dc9785a..e519fa6 100755
--- a/dev/run
+++ b/dev/run
@@ -31,7 +31,6 @@ from pbkdf2 import pbkdf2_hex
 
 COMMON_SALT = uuid.uuid4().hex
 COMMON_CSRF_SECRET = uuid.uuid4().hex
-HAPROXY_PORT = os.environ.get(HAPROXY_PORT, 5984)
 
 try:
 from urllib import urlopen
@@ -111,6 +110,12 @@ def setup_argparse():
   dest='no_join', default=False,
   action='store_true',
   help='Do not join nodes on boot')
+parser.add_option('--with-haproxy', dest='with_haproxy', default=False,
+  action='store_true', help='Use HAProxy')
+parser.add_option('--haproxy', dest='haproxy', default='haproxy',
+  help='HAProxy executable path')
+parser.add_option('--haproxy-port', dest='haproxy_port', default='5984',
+  help='HAProxy port')
 return parser.parse_args()
 
 
@@ -125,6 +130,9 @@ def setup_context(opts, args):
 'rootdir': os.path.dirname(os.path.dirname(fpath)),
 'cmd': ' '.join(args),
 'verbose': opts.verbose,
+'with_haproxy': opts.with_haproxy,
+'haproxy': opts.haproxy,
+'haproxy_port': opts.haproxy_port,
 'procs': []}
 
 
@@ -163,6 +171,10 @@ def setup_configs(ctx):
 backend_port: backend_port,
 fauxton_root: src/fauxton/dist/release
 }
+if os.name == 'nt':
+# Erlang always wants UNIX-style paths
+env[data_dir] = env[data_dir].replace(\\, /)
+env[view_index_dir] = env[view_index_dir].replace(\\, /)
 write_config(ctx, node, env)
 
 
@@ -194,23 +206,12 @@ def write_config(ctx, node, env):
 handle.write(content)
 
 
-def find_haproxy():
-p = sp.Popen(
-[which, haproxy],
-stdin=sp.PIPE,
-stdout=sp.PIPE,
-stderr=sp.STDOUT
-)
-(res, _) = p.communicate()
-if res.strip():
-return res.strip().decode()
-return /usr/sbin/haproxy
-
-
 def boot_haproxy(ctx):
+if not ctx['with_haproxy']:
+return
 config = os.path.join(ctx['rootdir'], rel, haproxy.cfg)
 cmd = [
-find_haproxy(),
+ctx['haproxy'],
 -f,
 config
 ]
@@ -218,7 +219,7 @@ def boot_haproxy(ctx):
 log = open(logfname, w)
 env = os.environ.copy()
 if HAPROXY_PORT not in env:
-env[HAPROXY_PORT] = HAPROXY_PORT
+env[HAPROXY_PORT] = ctx['haproxy_port']
 return sp.Popen(
  .join(cmd),
 shell=True,
@@ -232,6 +233,9 @@ def boot_haproxy(ctx):
 def hack_default_ini(ctx, node, content):
 # Replace log file
 logfile = os.path.join(ctx['devdir'], logs, %s.log % node)
+if os.name == 'nt':
+# Erlang always wants UNIX-style paths
+logfile = logfile.replace(\\, /)
 repl = file = %s % logfile
 contents = re.sub((?m)^file.*$, repl, content)
 
@@ -304,7 +308,7 @@ def startup(ctx):
 
 def kill_processes(ctx):
 for proc in ctx['procs']:
-if proc.returncode is None:
+if proc and proc.returncode is None:
 proc.kill()
 
 
@@ -376,6 +380,9 @@ def boot_node(ctx, node):
 ]
 logfname = os.path.join(ctx['devdir'], logs, %s.log % node)
 log = open(logfname, wb)
+if os.name == 'nt':
+# Erlang always wants UNIX-style paths
+cmd = [x.replace(\\, /) for x in cmd]
 return sp.Popen(cmd, stdin=sp.PIPE, stdout=log, stderr=sp.STDOUT, env=env)
 
 
@@ -488,7 +495,7 @@ def create_system_databases(host, port):
 def join(ctx, lead_port, user, password):
 while True:
 for proc in ctx['procs']:
-if proc.returncode is not None:
+if proc is not None and proc.returncode is not None:
 exit(1)
 time.sleep(2)

couchdb commit: updated refs/heads/master to a84fcb2

2015-09-09 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 71fb2b8c1 -> a84fcb2d9


Set -name to hostname during ./configure for Win64

CC @janl simple enough ;)


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

Branch: refs/heads/master
Commit: a84fcb2d98af2781b2c595c15d84ced5474de09c
Parents: 71fb2b8
Author: Joan Touzet 
Authored: Wed Sep 9 22:14:40 2015 -0400
Committer: Joan Touzet 
Committed: Wed Sep 9 22:16:40 2015 -0400

--
 configure.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a84fcb2d/configure.ps1
--
diff --git a/configure.ps1 b/configure.ps1
index 75a6d17..23f2a5b 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -114,6 +114,7 @@ $InstallDir="$LibDir\couchdb"
 $LogFile="$LogDir\couch.log"
 $BuildFauxton = [int](-not $DisableFauxton)
 $BuildDocs = [int](-not $DisableDocs)
+$Hostname = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName
 
 Write-Verbose "==> configuring couchdb in rel\couchdb.config"
 $CouchDBConfig = @"
@@ -138,7 +139,7 @@ $CouchDBConfig = @"
 {log_file, "$LogFile"}.
 {fauxton_root, "$DataRootDir/couchdb/www"}.
 {user, "$CouchDBUser"}.
-{node_name, "-name couchdb"}.
+{node_name, "-name $Hostname"}.
 {cluster_port, 5984}.
 {backend_port, 5986}.
 "@

couch commit: updated refs/heads/master to 9aff2f6

2015-09-09 Thread wohali 
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 9d4b0fe72 -> 9aff2f663


Add libcurl support for Windows


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

Branch: refs/heads/master
Commit: 9aff2f663cd4a90e7b99aecb8044809f1af46922
Parents: 9d4b0fe
Author: Joan Touzet 
Authored: Wed Sep 9 14:41:03 2015 -0400
Committer: Joan Touzet 
Committed: Wed Sep 9 14:41:20 2015 -0400

--
 priv/couch_js/http.c |  2 ++
 rebar.config.script  | 26 ++
 2 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/9aff2f66/priv/couch_js/http.c
--
diff --git a/priv/couch_js/http.c b/priv/couch_js/http.c
index c5d5e88..c4b3896 100644
--- a/priv/couch_js/http.c
+++ b/priv/couch_js/http.c
@@ -83,7 +83,9 @@ http_uri(JSContext* cx, JSObject* req, couch_args* args, 
jsval* uri_val)
 
 #else
 #include 
+#ifndef XP_WIN
 #include 
+#endif
 
 
 void

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/9aff2f66/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 6d4968d..53b3ca9 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -62,9 +62,19 @@ ok = CopyIfDifferent(CouchJSConfig, ConfigBin),
 %% TODO support curl on Windows
 {JS_CFLAGS, JS_LDFLAGS} = case lists:keyfind(with_curl, 1, CouchConfig) of
 {with_curl, true} ->
-{"-DHAVE_CURL ", "-DHAVE_CURL -lmozjs185 -lcurl"};
+case os:type() of
+{win32, _} ->
+{"/DHAVE_CURL /IC:\\relax\\curl\\include", 
"/LIBPATH:C:\\relax\\js-1.8.5\\js\\src 
/LIBPATH:C:\\Relax\\curl\\lib\\release-ssl mozjs185-1.0.lib libcurl_imp.lib"};
+_ ->
+{"-DHAVE_CURL", "-DHAVE_CURL -lmozjs185 -lcurl"}
+end;
 _ ->
-{"", "-lmozjs185"}
+case os:type() of
+{win32, _} ->
+{"", "/LIBPATH:C:\\relax\\js-1.8.5\\js\\src mozjs185-1.0.lib"};
+_ ->
+{"", "-lmozjs185"}
+end
 end,
 
 CouchJSSrc = ["priv/couch_js/*.c"],
@@ -85,20 +95,20 @@ CompareSrc = ["priv/couch_ejson_compare/*.c"],
 
 BaseSpecs = [
 %% couchjs
-{"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ 
"-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " 
-L/usr/local/lib"}]}]},
-{"linux",  CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ 
"-DXP_UNIX -I/usr/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]},
-{"bsd",   CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ 
"-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " 
-L/usr/local/lib -lm"}]}]},
-{"win32",  CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", "/DXP_WIN 
/IC:\\relax\\js-1.8.5\\js\\src"}, {"LDFLAGS", 
"/LIBPATH:C:\\relax\\js-1.8.5\\js\\src mozjs185-1.0.lib"}]}]},
+{"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " 
-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " 
-L/usr/local/lib"}]}]},
+{"linux",  CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " 
-DXP_UNIX -I/usr/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]},
+{"bsd",   CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " 
-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " 
-L/usr/local/lib -lm"}]}]},
+{"win32",  CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " 
/DXP_WIN /IC:\\relax\\js-1.8.5\\js\\src"}, {"LDFLAGS", JS_LDFLAGS}]}]},
 % ICU
 {"darwin", IcuPath, IcuSrc, [{env, IcuEnv ++ IcuDarwinEnv}]},
 {"linux",  IcuPath, IcuSrc, [{env, IcuEnv}]},
 {"bsd",   IcuPath, IcuSrc, [{env, IcuEnv ++ IcuBsdEnv}]},
-{"win32",  IcuPath, IcuSrc, [{env, IcuEnv ++ IcuWinEnv}]},
+{"win32",  IcuPath, IcuSrc, [{env, IcuWinEnv}]},
 % ejson_compare
 {"darwin", ComparePath, CompareSrc, [{env, IcuEnv ++ IcuDarwinEnv}]},
 {"linux",  ComparePath, CompareSrc, [{env, IcuEnv}]},
 {"bsd",   ComparePath, CompareSrc, [{env, IcuEnv ++ IcuBsdEnv}]},
-{"win32",  ComparePath, CompareSrc, [{env, IcuEnv ++ IcuWinEnv}]}
+{"win32",  ComparePath, CompareSrc, [{env, IcuWinEnv}]}
 ],
 
 SpawnSpec = [

[3/4] couchdb commit: updated refs/heads/master to 3f1b0c4

2016-06-20 Thread wohali 
factoring out path manipulation into a function


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

Branch: refs/heads/master
Commit: c5dcb48e7973e3157c2ea0acffb2524002b8478f
Parents: a8e250b
Author: Joan Touzet 
Authored: Mon Jun 20 13:29:21 2016 -0400
Committer: Joan Touzet 
Committed: Mon Jun 20 13:29:21 2016 -0400

--
 dev/run | 42 +-
 1 file changed, 17 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c5dcb48e/dev/run
--
diff --git a/dev/run b/dev/run
index 81140c4..233438d 100755
--- a/dev/run
+++ b/dev/run
@@ -19,8 +19,10 @@ import functools
 import glob
 import inspect
 import json
+import ntpath
 import optparse
 import os
+import posixpath
 import re
 import subprocess as sp
 import sys
@@ -42,6 +44,12 @@ except ImportError:
 import http.client as httpclient
 
 
+def toposixpath(path):
+if os.sep == ntpath.sep:
+return path.replace(ntpath.sep, posixpath.sep)
+else:
+return path
+
 def log(msg):
 def decorator(func):
 @functools.wraps(func)
@@ -162,23 +170,18 @@ def setup_configs(ctx):
 for idx, node in enumerate(ctx['nodes']):
 cluster_port, backend_port = get_ports(idx + ctx['node_number'])
 env = {
-"prefix": ctx['rootdir'],
+"prefix": toposixpath(ctx['rootdir']),
 "package_author_name": "The Apache Software Foundation",
-"data_dir": ensure_dir_exists(ctx['devdir'],
-  "lib", node, "data"),
-"view_index_dir": ensure_dir_exists(ctx['devdir'],
-"lib", node, "data"),
+"data_dir": toposixpath(ensure_dir_exists(ctx['devdir'],
+  "lib", node, "data")),
+"view_index_dir": toposixpath(ensure_dir_exists(ctx['devdir'],
+"lib", node, "data")),
 "node_name": "-name %s@127.0.0.1" % node,
 "cluster_port": cluster_port,
 "backend_port": backend_port,
 "fauxton_root": "src/fauxton/dist/release",
 "uuid": "fake_uuid_for_dev"
 }
-if os.sep == '\\':
-# Erlang always wants UNIX-style paths
-env["data_dir"] = env["data_dir"].replace("\\", "/")
-env["view_index_dir"] = env["view_index_dir"].replace("\\", "/")
-env["prefix"] = env["prefix"].replace("\\", "/")
 write_config(ctx, node, env)
 
 
@@ -236,10 +239,7 @@ def boot_haproxy(ctx):
 
 def hack_default_ini(ctx, node, content):
 # Replace log file
-logfile = os.path.join(ctx['devdir'], "logs", "%s.log" % node)
-if os.sep == '\\':
-# Erlang always wants UNIX-style paths
-logfile = logfile.replace("\\", "/")
+logfile = toposixpath(os.path.join(ctx['devdir'], "logs", "%s.log" % node))
 repl = "file = %s" % logfile
 contents = re.sub("(?m)^file.*$", repl, content)
 
@@ -248,16 +248,10 @@ def hack_default_ini(ctx, node, content):
 mainjs = os.path.join(ctx['rootdir'], "share", "server", "main.js")
 coffeejs = os.path.join(ctx['rootdir'], "share", "server", 
"main-coffee.js")
 
-repl = "javascript = %s %s" % (couchjs, mainjs)
-if os.sep == '\\':
-# Erlang always wants UNIX-style paths
-repl = repl.replace("\\", "/")
+repl = toposixpath("javascript = %s %s" % (couchjs, mainjs))
 contents = re.sub("(?m)^javascript.*$", repl, contents)
 
-repl = "coffeescript = %s %s" % (couchjs, coffeejs)
-if os.sep == '\\':
-# Erlang always wants UNIX-style paths
-repl = repl.replace("\\", "/")
+repl = toposixpath("coffeescript = %s %s" % (couchjs, coffeejs))
 contents = re.sub("(?m)^coffeescript.*$", repl, contents)
 
 return contents
@@ -388,9 +382,7 @@ def boot_node(ctx, node):
 ]
 logfname = os.path.join(ctx['devdir'], "logs", "%s.log" % node)
 log = open(logfname, "wb")
-if os.sep == '\\':
-# Erlang always wants UNIX-style paths
-cmd = [x.replace("\\", "/") for x in cmd]
+cmd = [toposixpath(x) for x in cmd]
 return sp.Popen(cmd, stdin=sp.PIPE, stdout=log, stderr=sp.STDOUT, env=env)

[2/4] couchdb commit: updated refs/heads/master to 3f1b0c4

2016-06-20 Thread wohali 
Check for platform path separator instead of OS check


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

Branch: refs/heads/master
Commit: a8e250b8e9983e61d5f881575410c7a0de9fb7b2
Parents: 03bbe21
Author: Joan Touzet 
Authored: Mon Jun 20 01:55:58 2016 -0400
Committer: Joan Touzet 
Committed: Mon Jun 20 01:55:58 2016 -0400

--
 dev/run | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a8e250b8/dev/run
--
diff --git a/dev/run b/dev/run
index 81398d0..81140c4 100755
--- a/dev/run
+++ b/dev/run
@@ -174,7 +174,7 @@ def setup_configs(ctx):
 "fauxton_root": "src/fauxton/dist/release",
 "uuid": "fake_uuid_for_dev"
 }
-if os.name == 'nt':
+if os.sep == '\\':
 # Erlang always wants UNIX-style paths
 env["data_dir"] = env["data_dir"].replace("\\", "/")
 env["view_index_dir"] = env["view_index_dir"].replace("\\", "/")
@@ -237,7 +237,7 @@ def boot_haproxy(ctx):
 def hack_default_ini(ctx, node, content):
 # Replace log file
 logfile = os.path.join(ctx['devdir'], "logs", "%s.log" % node)
-if os.name == 'nt':
+if os.sep == '\\':
 # Erlang always wants UNIX-style paths
 logfile = logfile.replace("\\", "/")
 repl = "file = %s" % logfile
@@ -249,13 +249,13 @@ def hack_default_ini(ctx, node, content):
 coffeejs = os.path.join(ctx['rootdir'], "share", "server", 
"main-coffee.js")
 
 repl = "javascript = %s %s" % (couchjs, mainjs)
-if os.name == 'nt':
+if os.sep == '\\':
 # Erlang always wants UNIX-style paths
 repl = repl.replace("\\", "/")
 contents = re.sub("(?m)^javascript.*$", repl, contents)
 
 repl = "coffeescript = %s %s" % (couchjs, coffeejs)
-if os.name == 'nt':
+if os.sep == '\\':
 # Erlang always wants UNIX-style paths
 repl = repl.replace("\\", "/")
 contents = re.sub("(?m)^coffeescript.*$", repl, contents)
@@ -388,7 +388,7 @@ def boot_node(ctx, node):
 ]
 logfname = os.path.join(ctx['devdir'], "logs", "%s.log" % node)
 log = open(logfname, "wb")
-if os.name == 'nt':
+if os.sep == '\\':
 # Erlang always wants UNIX-style paths
 cmd = [x.replace("\\", "/") for x in cmd]
 return sp.Popen(cmd, stdin=sp.PIPE, stdout=log, stderr=sp.STDOUT, env=env)

[4/4] couchdb commit: updated refs/heads/master to 3f1b0c4

2016-06-20 Thread wohali 
Merge branch '3040-fix-default-ini' of https://github.com/wohali/couchdb


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

Branch: refs/heads/master
Commit: 3f1b0c4e2da8cb8b2390d62412cdf0d0c0bd47c4
Parents: 5e8041e c5dcb48
Author: Joan Touzet <woh...@apache.org>
Authored: Mon Jun 20 16:13:45 2016 -0400
Committer: Joan Touzet <woh...@apache.org>
Committed: Mon Jun 20 16:13:45 2016 -0400

--
 dev/run | 36 +---
 1 file changed, 17 insertions(+), 19 deletions(-)
--

[1/4] couchdb commit: updated refs/heads/master to 3f1b0c4

2016-06-20 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 5e8041e96 -> 3f1b0c4e2


Use UNIX-style paths for view servers on Windows


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

Branch: refs/heads/master
Commit: 03bbe213ef49cb8f2bfac190257f0cbe9b1d5f54
Parents: 5e8041e
Author: Joan Touzet 
Authored: Fri Jun 17 19:12:41 2016 -0400
Committer: Joan Touzet 
Committed: Fri Jun 17 19:12:41 2016 -0400

--
 dev/run | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/03bbe213/dev/run
--
diff --git a/dev/run b/dev/run
index 8f2164e..81398d0 100755
--- a/dev/run
+++ b/dev/run
@@ -249,9 +249,15 @@ def hack_default_ini(ctx, node, content):
 coffeejs = os.path.join(ctx['rootdir'], "share", "server", 
"main-coffee.js")
 
 repl = "javascript = %s %s" % (couchjs, mainjs)
+if os.name == 'nt':
+# Erlang always wants UNIX-style paths
+repl = repl.replace("\\", "/")
 contents = re.sub("(?m)^javascript.*$", repl, contents)
 
 repl = "coffeescript = %s %s" % (couchjs, coffeejs)
+if os.name == 'nt':
+# Erlang always wants UNIX-style paths
+repl = repl.replace("\\", "/")
 contents = re.sub("(?m)^coffeescript.*$", repl, contents)
 
 return contents

couchdb commit: updated refs/heads/master to 41e529d

2016-08-11 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 0b3419b81 -> 41e529d17


Ref. latest doc build chain fixes


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

Branch: refs/heads/master
Commit: 41e529d1724883df6304bfd59937db0122d00082
Parents: 0b3419b
Author: Joan Touzet 
Authored: Thu Aug 11 17:18:08 2016 -0400
Committer: Joan Touzet 
Committed: Thu Aug 11 17:18:08 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/41e529d1/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 1e12128..841e255 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -38,7 +38,7 @@ DepDescs = [
 {couch_stats,  "couch-stats",  
"7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
 {couch_peruser,"peruser",  
"ff7d190970a46722137fbc7a1a75466e8a544ae1"},
 {couch_tests,   "erlang-tests",
"37b3bfeb4b1a48a592456e67991362e155ed81e0"},
-{docs, "documentation",
"eab768d17ca0b9d20f4fc884a48376c9533356c1", [raw]},
+{docs, "documentation",
"59edec50399484ebf0bf784faf28ca6a2f4e8829", [raw]},
 {ddoc_cache,   "ddoc-cache",   
"c762e90a33ce3cda19ef142dd1120f1087ecd876"},
 {ets_lru,  "ets-lru",  
"c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
 {fabric,   "fabric",   
"78eb096dae277facc5cf4f6f166e5591da6c165f"},

[couchdb] Git Push Summary

2016-08-11 Thread wohali 
Repository: couchdb
Updated Tags:  refs/tags/2.0.0-RC4 [created] d4d820e39

[couchdb] Git Push Summary

2016-08-12 Thread wohali 
Repository: couchdb
Updated Tags:  refs/tags/2.0.0-RC3 [created] 32c5da35f

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

2016-07-13 Thread wohali 
Repository: couchdb-couch
Updated Branches:
  refs/heads/master fc4e64d84 -> 0330583e3


Skip couchdb_os_daemons_tests on Windows


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

Branch: refs/heads/master
Commit: 0c012f843c1e0de09beca23cf3f16007ca01979b
Parents: fc4e64d
Author: Joan Touzet 
Authored: Wed Jul 13 03:52:03 2016 -0400
Committer: Joan Touzet 
Committed: Wed Jul 13 03:52:03 2016 -0400

--
 .gitignore| 2 ++
 rebar.config  | 1 +
 test/couchdb_os_daemons_tests.erl | 6 ++
 3 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0c012f84/.gitignore
--
diff --git a/.gitignore b/.gitignore
index c1a4701..30aa173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ priv/couchjs
 priv/couchspawnkillable
 priv/*.exp
 priv/*.lib
+priv/*.dll
+priv/*.exe
 vc120.pdb
 
 .rebar/

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0c012f84/rebar.config
--
diff --git a/rebar.config b/rebar.config
new file mode 100644
index 000..202a563
--- /dev/null
+++ b/rebar.config
@@ -0,0 +1 @@
+{eunit_compile_opts, [{platform_define, "win32", 'WINDOWS'}]}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0c012f84/test/couchdb_os_daemons_tests.erl
--
diff --git a/test/couchdb_os_daemons_tests.erl 
b/test/couchdb_os_daemons_tests.erl
index dd6591e..38532f2 100644
--- a/test/couchdb_os_daemons_tests.erl
+++ b/test/couchdb_os_daemons_tests.erl
@@ -12,6 +12,12 @@
 
 -module(couchdb_os_daemons_tests).
 
+%% tests are UNIX-specific, will not function under Windows
+-ifdef(WINDOWS).
+-undef(TEST).
+-define(NOTEST, 1).
+-endif.
+
 -include_lib("couch/include/couch_eunit.hrl").
 
 %% keep in sync with couchdb/couch_os_daemons.erl

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

2016-07-13 Thread wohali 
Merge branch '3040-skip-os-daemon-tests' 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/0330583e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/0330583e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/0330583e

Branch: refs/heads/master
Commit: 0330583e3095fe2c95495f1ef99a1c6f82c1f79b
Parents: fc4e64d 0c012f8
Author: Joan Touzet <woh...@apache.org>
Authored: Wed Jul 13 15:58:02 2016 -0400
Committer: Joan Touzet <woh...@apache.org>
Committed: Wed Jul 13 15:58:02 2016 -0400

--
 .gitignore| 2 ++
 rebar.config  | 1 +
 test/couchdb_os_daemons_tests.erl | 6 ++
 3 files changed, 9 insertions(+)
--

couchdb commit: updated refs/heads/master to 0a32216

2016-07-13 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master fb1640c81 -> 0a32216b9


Bump couch for Windows test fix


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

Branch: refs/heads/master
Commit: 0a32216b9f6b8599f11f71b645dc8328bc2d4e09
Parents: fb1640c
Author: Joan Touzet 
Authored: Thu Jul 14 01:59:15 2016 -0400
Committer: Joan Touzet 
Committed: Thu Jul 14 01:59:15 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/0a32216b/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 3eea0ed..77d55dd 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
 {couch_log,"couch-log",
"cc5540419e0a4bb7872d18bc5a94f39446d83a88"},
 {couch_log_lager,  "couch-log-lager",  
"a7a8b7efb8855a8b0cf9612eeca7c190c414bbfb"},
 {chttpd,   "chttpd",   
"5e3bf1f5e2e96841ce0d2b26606c7f590c067bdc"},
-{couch,"couch",
"8c6de9f7f6612813db89ae91ae89a246aac1ec29"},
+{couch,"couch",
"b0d21d26d95545b7bba1371f01aad9bb04700cb2"},
 {couch_index,  "couch-index",  
"e7d269800302224eacf9585f74eb30822495755b"},
 {couch_mrview, "couch-mrview", 
"cfc354989a28865ec83efc0f745e91b8c6a3a6c3"},
 {couch_replicator, "couch-replicator", 
"8629fb2690e4d11ecc0ad15ef032d3f109a93285"},

couch commit: updated refs/heads/master to 8c6de9f

2016-07-13 Thread wohali 
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 0330583e3 -> 8c6de9f7f


remove unneded include


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

Branch: refs/heads/master
Commit: 8c6de9f7f6612813db89ae91ae89a246aac1ec29
Parents: 0330583
Author: Joan Touzet 
Authored: Wed Jul 13 22:39:28 2016 -0400
Committer: Joan Touzet 
Committed: Wed Jul 13 22:39:28 2016 -0400

--
 priv/couch_js/main.c | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/8c6de9f7/priv/couch_js/main.c
--
diff --git a/priv/couch_js/main.c b/priv/couch_js/main.c
index b2cd210..50d072c 100644
--- a/priv/couch_js/main.c
+++ b/priv/couch_js/main.c
@@ -16,7 +16,6 @@
 
 #ifdef XP_WIN
 #include 
-#include 
 #else
 #include 
 #endif

couchdb commit: updated refs/heads/master to fb1640c

2016-07-13 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 92c95dece -> fb1640c81


update couch dependency with Windows fixes


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

Branch: refs/heads/master
Commit: fb1640c81fd185d21b071e9b984138e4fccd9273
Parents: 92c95de
Author: Joan Touzet 
Authored: Wed Jul 13 23:46:09 2016 -0400
Committer: Joan Touzet 
Committed: Wed Jul 13 23:46:09 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/fb1640c8/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index e3cfa8e..3eea0ed 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
 {couch_log,"couch-log",
"cc5540419e0a4bb7872d18bc5a94f39446d83a88"},
 {couch_log_lager,  "couch-log-lager",  
"a7a8b7efb8855a8b0cf9612eeca7c190c414bbfb"},
 {chttpd,   "chttpd",   
"5e3bf1f5e2e96841ce0d2b26606c7f590c067bdc"},
-{couch,"couch",
"fc4e64d84f4de068cb54db635ad9900bb187289a"},
+{couch,"couch",
"8c6de9f7f6612813db89ae91ae89a246aac1ec29"},
 {couch_index,  "couch-index",  
"e7d269800302224eacf9585f74eb30822495755b"},
 {couch_mrview, "couch-mrview", 
"cfc354989a28865ec83efc0f745e91b8c6a3a6c3"},
 {couch_replicator, "couch-replicator", 
"8629fb2690e4d11ecc0ad15ef032d3f109a93285"},

couch commit: updated refs/heads/master to b0d21d2

2016-07-13 Thread wohali 
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 8c6de9f7f -> b0d21d26d


Fix Windows-specific definition


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

Branch: refs/heads/master
Commit: b0d21d26d95545b7bba1371f01aad9bb04700cb2
Parents: 8c6de9f
Author: Joan Touzet 
Authored: Thu Jul 14 01:57:27 2016 -0400
Committer: Joan Touzet 
Committed: Thu Jul 14 01:57:27 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/b0d21d26/rebar.config
--
diff --git a/rebar.config b/rebar.config
index 202a563..43e2924 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1 +1,2 @@
+{erl_opts, [{platform_define, "win32", 'WINDOWS'}]}.
 {eunit_compile_opts, [{platform_define, "win32", 'WINDOWS'}]}.

couchdb commit: updated refs/heads/master to d40ce3e

2016-07-18 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master e4e8a7d16 -> d40ce3e2d


Copy couchjs to rel for Windows


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

Branch: refs/heads/master
Commit: d40ce3e2d43aefdf42edeee6b12e6e3c35ba1922
Parents: e4e8a7d
Author: Joan Touzet 
Authored: Mon Jul 18 15:47:06 2016 -0400
Committer: Joan Touzet 
Committed: Mon Jul 18 15:47:06 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d40ce3e2/Makefile.win
--
diff --git a/Makefile.win b/Makefile.win
index b0336a1..83d88fa 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -189,6 +189,7 @@ release: all
@echo Installing CouchDB into rel\couchdb\ ...
-@rmdir /s/q rel\couchdb
@$(REBAR) generate
+   @copy src\couch\priv\couchjs.exe rel\couchdb\bin
 
 ifeq ($(with_fauxton), 1)
-@mkdir rel\couchdb\share

couchdb commit: updated refs/heads/master to dd8943e

2016-07-18 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master d40ce3e2d -> dd8943edf


Copy LICENSE file into release


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

Branch: refs/heads/master
Commit: dd8943edffac12cee36f67c61f165868cd4508a8
Parents: d40ce3e
Author: Joan Touzet 
Authored: Mon Jul 18 15:47:41 2016 -0400
Committer: Joan Touzet 
Committed: Mon Jul 18 15:47:41 2016 -0400

--
 rel/reltool.config | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/dd8943ed/rel/reltool.config
--
diff --git a/rel/reltool.config b/rel/reltool.config
index 9864427..4c990a8 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -121,6 +121,7 @@
 
 {overlay_vars, "couchdb.config"}.
 {overlay, [
+{copy, "../LICENSE", "LICENSE"},
 {mkdir, "var/log"},
 {copy, "overlay/bin"},
 {copy, "overlay/etc"},

[1/2] couchdb commit: updated refs/heads/master to b68e094

2016-07-19 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master e07dfde40 -> b68e09439


Revise Windows installation readme


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

Branch: refs/heads/master
Commit: b68e094392d11c319d40c7119f11f4f3f463bb42
Parents: 79d9aaf
Author: Joan Touzet 
Authored: Tue Jul 19 11:30:16 2016 -0400
Committer: Joan Touzet 
Committed: Tue Jul 19 11:30:25 2016 -0400

--
 INSTALL.Windows.md | 207 +++-
 1 file changed, 12 insertions(+), 195 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b68e0943/INSTALL.Windows.md
--
diff --git a/INSTALL.Windows.md b/INSTALL.Windows.md
index 7622eac..9ba84b7 100644
--- a/INSTALL.Windows.md
+++ b/INSTALL.Windows.md
@@ -1,204 +1,21 @@
 Apache CouchDB INSTALL.Windows
 ==
 
-For a high-level guide to Microsoft Windows.
+Due to the complexity of building CouchDB on the Windows platform,
+full build documentation and all necessary support files are in
+the couchdb-glazier repository.
 
-Troubleshooting

+Be sure to find the branch that matches the release you are building, for
+example `couchdb_2.0`.
 
-There is a troubleshooting guide:
-
-http://wiki.apache.org/couchdb/Troubleshooting
-
-There is a wiki for general documentation:
-
-http://wiki.apache.org/couchdb/
-
-And some Windows-specific tips:
-
-http://wiki.apache.org/couchdb/Quirks_on_Windows
-
-There are collection of friendly mailing lists:
-
-http://couchdb.apache.org/community/lists.html
-
-Please work through these in order if you experience any problems.
-
-Dependencies
+Build & Test
 
+Once all dependencies are built and installed per the documentation in
+couchdb-glazier, these commands will configure and build CouchDB:
 
-You will need the following installed:
-
- * Erlang OTP (>=R16B03-1, =<18.1) (http://erlang.org/)
- * ICU(>=4.*)(http://icu-project.org/)
- * OpenSSL(>=0.9.8r) (http://www.openssl.org/)
- * Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/)
- * libcurl(>=7.20)   (http://curl.haxx.se/libcurl/)
- * Cygwin(http://www.cygwin.com/)
- * Microsoft SDK 7.0 or 7.1  
(http://www.microsoft.com/en-us/download/details.aspx?id=8279)
- * Python (>= 2.68) for docs (http://python.org/)
- * Python Sphinx (>=1.1.3)   (http://pypi.python.org/pypi/Sphinx)
-
-General Notes
--
-
- * When installing Cygwin, be sure to select all the `development` tools.
-
- * When installing Erlang, you must build it from source.
-
- * The CouchDB build requires a number of the Erlang build scripts.
-
- * All dependent libraries should be built with the same version of
-   microsoft SDK.
-
- * Do not try to link against libraries built with, or included in,
-   Cygwin or MingW. They are not compatible with the Erlang/OTP or CouchDB
-   build scripts.
-
- * ICU version 4.6 and later will build cleanly using MSBuild.
-
- * Python and Sphinx are optional for building the online documentation.
-   Use cygwin-provided Python and install Sphinx via easy_install or pip.
-   Further information is here http://pypi.python.org/pypi/setuptools#id4
-
-Setting Up Cygwin
--
-
-Before starting any Cygwin terminals, run:
-
-set CYGWIN=nontsec
-
-To set up your environment, run:
-
-[VS_BIN]/vcvars32.bat
-
-Replace [VS_BIN] with the path to your Visual Studio `bin` directory.
-
-You must check that:
-
-* The `which link` command points to the Microsoft linker.
-
-* The `which cl` command points to the Microsoft compiler.
-
-* The `which mc` command points to the Microsoft message compiler.
-
-* The `which mt` command points to the Microsoft manifest tool.
-
-* The `which nmake` command points to the Microsoft make tool.
-
-If you do not do this, the build may fail due to Cygwin ones found in 
`/usr/bin`
-being used instead.
-
-Building Erlang

-
-You must include Win32 OpenSSL, built statically from source. Use
-exactly the same version as required by the Erlang/OTP build process.
-
-However, you can skip the GUI tools by running:
-
-   echo "skipping gs" > lib/gs/SKIP
-
-   echo "skipping ic" > lib/ic/SKIP
-
-   echo "skipping jinterface" > lib/jinterface/SKIP
-
-Follow the rest of the Erlang instructions as described.
-
-After running:
-
-   ./otp_build release -a
-
-You should run:
-
-   ./release/win32/Install.exe -s
-
-This will set up the release/win32/bin directory

[2/2] couchdb commit: updated refs/heads/master to b68e094

2016-07-19 Thread wohali 
Quote application paths on Windows


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

Branch: refs/heads/master
Commit: 79d9aaf7d00a2b9cb5331a4607a0bfb90ed27520
Parents: e07dfde
Author: Joan Touzet 
Authored: Tue Jul 19 11:28:53 2016 -0400
Committer: Joan Touzet 
Committed: Tue Jul 19 11:30:25 2016 -0400

--
 rel/overlay/bin/couchdb.cmd | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/79d9aaf7/rel/overlay/bin/couchdb.cmd
--
diff --git a/rel/overlay/bin/couchdb.cmd b/rel/overlay/bin/couchdb.cmd
index 831511f..a26e152 100644
--- a/rel/overlay/bin/couchdb.cmd
+++ b/rel/overlay/bin/couchdb.cmd
@@ -14,7 +14,7 @@
 
 SET COUCHDB_BIN_DIR=%~dp0
 SET ROOTDIR=%COUCHDB_BIN_DIR%\..\
-CD %ROOTDIR%
+CD "%ROOTDIR%"
 
 SET /P START_ERL= < releases\start_erl.data
 FOR /F "tokens=1" %%G IN ("%START_ERL%") DO SET ERTS_VSN=%%G
@@ -23,9 +23,10 @@ FOR /F "tokens=2" %%G IN ("%START_ERL%") DO SET APP_VSN=%%G
 set BINDIR=%ROOTDIR%/erts-%ERTS_VSN%/bin
 set EMU=beam
 set PROGNAME=%~n0
+set PATH=%PATH%;%COUCHDB_BIN_DIR%
 
-%BINDIR%\erl -boot %ROOTDIR%\releases\%APP_VSN%\couchdb ^
--args_file %ROOTDIR%\etc\vm.args ^
--config %ROOTDIR%\releases\%APP_VSN%\sys.config
+"%BINDIR%\erl" -boot "%ROOTDIR%\releases\%APP_VSN%\couchdb" ^
+-args_file "%ROOTDIR%\etc\vm.args" ^
+-config "%ROOTDIR%\releases\%APP_VSN%\sys.config"
 
 :: EXIT /B

documentation commit: updated refs/heads/master to eab768d

2016-07-15 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 2dda387ea -> eab768d17


Fix Windows documentation build


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

Branch: refs/heads/master
Commit: eab768d17ca0b9d20f4fc884a48376c9533356c1
Parents: 2dda387
Author: Joan Touzet 
Authored: Fri Jul 15 18:10:19 2016 -0400
Committer: Joan Touzet 
Committed: Fri Jul 15 18:10:19 2016 -0400

--
 make.bat | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/eab768d1/make.bat
--
diff --git a/make.bat b/make.bat
index 9e1fc08..1cfba34 100644
--- a/make.bat
+++ b/make.bat
@@ -5,9 +5,13 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
 )
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
+set BUILDDIR=build
+set SOURCE=src/
+set PAPERSIZE=-D latex_paper_size=a4
+set SPHINXFLAGS=-a -n -A local=1 %PAPERSIZE%
+set SPHINXOPTS=%SPHINXFLAGS% %SOURCE%
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS%
+set I18NSPHINXOPTS=%SPHINXOPTS%
 if NOT "%PAPER%" == "" (
set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
@@ -47,7 +51,7 @@ if "%1" == "clean" (
 )
 
 
-%SPHINXBUILD% 2> nul
+%SPHINXBUILD% 1> nul 2> nul
 if errorlevel 9009 (
echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx

couchdb commit: updated refs/heads/master to 47a65c0

2016-07-15 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 212ac60e5 -> 47a65c0c7


Add Windows Makefile, bump docs repo to match


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

Branch: refs/heads/master
Commit: 47a65c0c7b745c433c6c66720c46d7e0ec7e7a64
Parents: 212ac60
Author: Joan Touzet 
Authored: Fri Jul 15 18:12:47 2016 -0400
Committer: Joan Touzet 
Committed: Fri Jul 15 18:12:47 2016 -0400

--
 Makefile.win | 320 ++
 1 file changed, 320 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/47a65c0c/Makefile.win
--
diff --git a/Makefile.win b/Makefile.win
new file mode 100644
index 000..bf41d57
--- /dev/null
+++ b/Makefile.win
@@ -0,0 +1,320 @@
+# 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.
+
+include version.mk
+
+REBAR?=$(shell where rebar.cmd)
+IN_RELEASE = $(shell if not exist .git echo true)
+ifeq ($(IN_RELEASE), true)
+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)
+
+DESTDIR=
+
+# Rebar options
+apps=
+skip_deps=folsom,lager,meck,mochiweb,proper,snappy
+suites=
+tests=
+
+# no sed on Windows, hard code since apps\suites\tests are empty
+EUNIT_OPTS=skip_deps=$(skip_deps)
+DIALYZE_OPTS=skip_deps=$(skip_deps)
+
+
+# Main commands
+
+
+
+.PHONY: all
+# target: all - Build everything
+all: couch fauxton docs
+
+
+
+# Building
+
+
+
+.PHONY: couch
+# target: couch - Build CouchDB core
+couch: config.erl
+   @set COUCHDB_VERSION=$(COUCHDB_VERSION) && $(REBAR) compile
+   @copy src\couch\priv\couchjs.exe bin
+
+
+.PHONY: docs
+# target: docs - Build documentation
+ifeq ($(IN_RELEASE), true)
+docs: share\docs\html
+else
+docs: src\docs\build
+endif
+
+.PHONY: fauxton
+# target: fauxton - Build Fauxton web UI
+fauxton: share\www
+
+
+
+# Testing
+
+
+
+.PHONY: check
+# target: check - Test everything
+check: all
+   @$(MAKE) eunit
+   @$(MAKE) javascript
+
+
+.PHONY: eunit
+# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
+eunit: export ERL_AFLAGS = $(shell echo "-config rel/files/eunit.config")
+eunit: export BUILDDIR = $(shell echo %cd%)
+eunit:
+   @$(REBAR) setup_eunit 2> nul
+   @$(REBAR) -r eunit $(EUNIT_OPTS)
+
+
+.PHONY: javascript
+# target: javascript - Run JavaScript test suites or specific ones defined by 
suites option
+javascript:
+   -@mkdir share\www\script\test
+ifeq ($(IN_RELEASE), true)
+   @copy test\javascript\tests\lorem*.txt share\www\script\test
+else
+   -@mkdir src\fauxton\dist\release\test
+   @copy test\javascript\tests\lorem*.txt src\fauxton\dist\release\test
+endif
+   -@rmdir /s/q dev\lib
+   @python dev\run -n 1 -q --with-admin-party-please python 
test\javascript\run $(suites)
+
+
+.PHONY: check-qs
+# target: check-qs - Run query server tests (ruby and rspec required!)
+check-qs:
+   @QS_LANG=js rspec test\view_server\query_server_spec.rb
+
+
+
+# Developing
+
+
+
+.PHONY: build-plt
+# target: build-plt - Build project-specific PLT
+build-plt:
+   @$(REBAR) -r build-plt $(DIALYZE_OPTS)
+
+
+.PHONY: check-plt
+# target: check-plt - Check the PLT for consistency and rebuild it if it is 
not up-to-date
+check-plt:
+   @$(REBAR) -r check-plt $(DIALYZE_OPTS)
+
+
+.PHONY: dialyze
+# target:

couchdb commit: updated refs/heads/master to 33c8ca6

2016-07-15 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 47a65c0c7 -> 33c8ca61b


Bump docs repo for Windows changes


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

Branch: refs/heads/master
Commit: 33c8ca61b9c91166a5ddf3d2765850ac15d4af29
Parents: 47a65c0
Author: Joan Touzet 
Authored: Fri Jul 15 18:13:53 2016 -0400
Committer: Joan Touzet 
Committed: Fri Jul 15 18:13:53 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/33c8ca61/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 59cc46a..8dd9e43 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -39,7 +39,7 @@ DepDescs = [
 {couch_stats,  "couch-stats",  
"7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
 {couch_peruser,"peruser",  
"ff7d190970a46722137fbc7a1a75466e8a544ae1"},
 {couch_tests,   "erlang-tests",
"37b3bfeb4b1a48a592456e67991362e155ed81e0"},
-{docs, "documentation",
"2dda387ea5cc21861d8797ea2c8a82c3b439d55f", [raw]},
+{docs, "documentation",
"eab768d17ca0b9d20f4fc884a48376c9533356c1", [raw]},
 {ddoc_cache,   "ddoc-cache",   
"c762e90a33ce3cda19ef142dd1120f1087ecd876"},
 {ets_lru,  "ets-lru",  
"c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
 {fabric,   "fabric",   
"ebea1b8f5d49fe60f326b33dbdc06176ecfea5d1"},

couchdb commit: updated refs/heads/master to 660c32f

2016-07-15 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 33c8ca61b -> 660c32f12


Remove unbuilt doc targets from Win build


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

Branch: refs/heads/master
Commit: 660c32f122a47b2a4b09ee0480a558d110d52073
Parents: 33c8ca6
Author: Joan Touzet 
Authored: Fri Jul 15 18:47:08 2016 -0400
Committer: Joan Touzet 
Committed: Fri Jul 15 18:47:08 2016 -0400

--
 Makefile.win | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/660c32f1/Makefile.win
--
diff --git a/Makefile.win b/Makefile.win
index bf41d57..6794bf9 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -76,8 +76,8 @@ fauxton: share\www
 .PHONY: check
 # target: check - Test everything
 check: all
-   @$(MAKE) eunit
-   @$(MAKE) javascript
+   @$(MAKE) -f Makefile.win eunit
+   @$(MAKE) -f Makefile.win javascript
 
 
 .PHONY: eunit
@@ -200,13 +200,13 @@ ifeq ($(IN_RELEASE), true)
-@mkdir rel\couchdb\share\www\docs
-@mkdir rel\couchdb\share\docs
@robocopy /E share\docs\html\* rel\couchdb\share\www\docs
-   @copy share\docs\pdf\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf
+#  @copy share\docs\pdf\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf
@copy share\docs\man\apachecouchdb.1 rel\couchdb\share\docs\couchdb.1
@copy share\docs\info\CouchDB.info rel\couchdb\share\docs\CouchDB.info
 else
-@mkdir rel\couchdb\share\docs
-   @robocopy /E src\docs\build\html\ rel\couchdb\share\www\docs
-   @copy src\docs\build\latex\CouchDB.pdf 
rel\couchdb\share\docs\CouchDB.pdf
+   @robocopy /E src\docs\build\html\* rel\couchdb\share\www\docs
+#  @copy src\docs\build\latex\CouchDB.pdf 
rel\couchdb\share\docs\CouchDB.pdf
@copy src\docs\build\man\apachecouchdb.1 
rel\couchdb\share\docs\couchdb.1
@copy src\docs\build\texinfo\CouchDB.info 
rel\couchdb\share\docs\CouchDB.info
 endif

[1/2] couchdb commit: updated refs/heads/master to e4e8a7d

2016-07-18 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 18d17644c -> e4e8a7d16


More Windows fixes; make release now works


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

Branch: refs/heads/master
Commit: 7b06c98de5af2877369b3cb43b04ca5a1e05c39c
Parents: 9620ff6
Author: Joan Touzet 
Authored: Mon Jul 18 05:41:46 2016 -0400
Committer: Joan Touzet 
Committed: Mon Jul 18 05:41:46 2016 -0400

--
 Makefile.win| 45 +++-
 configure.ps1   | 12 +--
 rel/overlay/bin/couchdb.cmd | 31 +++
 3 files changed, 58 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7b06c98d/Makefile.win
--
diff --git a/Makefile.win b/Makefile.win
index 6794bf9..b0336a1 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -186,48 +186,45 @@ dist: all
 # target: release - Create an Erlang release including CouchDB!
 -include install.mk
 release: all
-   @echo "Installing CouchDB into rel\couchdb\ ..."
+   @echo Installing CouchDB into rel\couchdb\ ...
-@rmdir /s/q rel\couchdb
-   @$(REBAR) generate > \dev\null 2>&1 # make full erlang release
+   @$(REBAR) generate
 
 ifeq ($(with_fauxton), 1)
-@mkdir rel\couchdb\share
-   @robocopy /E share\www rel\couchdb\share
+   -@xcopy share\www rel\couchdb\share\www /E/I
 endif
 
 ifeq ($(with_docs), 1)
-ifeq ($(IN_RELEASE), true)
-@mkdir rel\couchdb\share\www\docs
-@mkdir rel\couchdb\share\docs
-   @robocopy /E share\docs\html\* rel\couchdb\share\www\docs
-#  @copy share\docs\pdf\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf
+ifeq ($(IN_RELEASE), true)
+   @xcopy share\docs\html rel\couchdb\share\www\docs /E /I
@copy share\docs\man\apachecouchdb.1 rel\couchdb\share\docs\couchdb.1
-   @copy share\docs\info\CouchDB.info rel\couchdb\share\docs\CouchDB.info
+   -@copy share\docs\info\CouchDB.info rel\couchdb\share\docs\CouchDB.info
 else
-   -@mkdir rel\couchdb\share\docs
-   @robocopy /E src\docs\build\html\* rel\couchdb\share\www\docs
-#  @copy src\docs\build\latex\CouchDB.pdf 
rel\couchdb\share\docs\CouchDB.pdf
+   @xcopy src\docs\build\html rel\couchdb\share\www\docs /E /I
@copy src\docs\build\man\apachecouchdb.1 
rel\couchdb\share\docs\couchdb.1
-   @copy src\docs\build\texinfo\CouchDB.info 
rel\couchdb\share\docs\CouchDB.info
+   -@copy src\docs\build\texinfo\CouchDB.info 
rel\couchdb\share\docs\CouchDB.info
 endif
 endif
 
-   @echo "... done"
-   @echo
-   @echo "You can now copy the rel\couchdb directory anywhere on your 
system."
-   @echo "Start CouchDB with .\bin\couchdb from within that directory."
-   @echo
+   @echo ... done
+   @echo .
+   @echo You can now copy the rel\couchdb directory anywhere on your 
system.
+   @echo Start CouchDB with .\bin\couchdb.cmd from within that 
directory.
+   @echo .
 
 .PHONY: install
 # target: install- install CouchDB :)
 install:
-   @echo
-   @echo "Notice: There is no 'make install' command for CouchDB 2.0 yet."
-   @echo
-   @echo "To install CouchDB into your system, copy the rel\couchdb"
-   @echo "to your desired installation location. For example:"
-   @echo "robocopy /E rel\couchdb \usr\local\lib"
-   @echo
+   @echo .
+   @echo Notice: There is no 'make install' command for CouchDB 2.0 yet.
+   @echo .
+   @echo To install CouchDB into your system, copy the rel\couchdb
+   @echo to your desired installation location. For example:
+   @echo xcopy /E rel\couchdb \usr\local\lib
+   @echo .
 
 

 # Cleaning
@@ -316,5 +313,5 @@ endif
 share\www:
 ifeq ($(with_fauxton), 1)
@echo "Building Fauxton"
-   @cd src\fauxton && npm install --production && 
.\node_modules\grunt-cli\bin\grunt couchdb
+   @cd src\fauxton && npm install --production && 
.\node_modules\.bin\grunt couchdb
 endif

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7b06c98d/configure.ps1
--
diff --git a/configure.ps1 b/configure.ps1
index 23f2a5b..b9ed805 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -133,13 +133,13 @@ $CouchDBConfig = @"
 % The contents of this file are auto-generated by configure
 %
 {package_author_name, "$PackageAuthorName"}.
-{prefix, "$InstallDir"}.

[2/2] couchdb commit: updated refs/heads/master to e4e8a7d

2016-07-18 Thread wohali 
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/couchdb


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

Branch: refs/heads/master
Commit: e4e8a7d16b1b0bf10fa3ba0fb542dedcee49d585
Parents: 7b06c98 18d1764
Author: Joan Touzet 
Authored: Mon Jul 18 05:42:12 2016 -0400
Committer: Joan Touzet 
Committed: Mon Jul 18 05:42:12 2016 -0400

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

couchdb commit: updated refs/heads/master to 6415cd1

2016-08-02 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 4f6d5865f -> 6415cd170


Remove incorrect logfile sed attempt in dev/run

This code was actually replacing the file_compression = snappy
line, which was preventing snappy from being tested in the test
suite.


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

Branch: refs/heads/master
Commit: 6415cd1702e16b8493c479af6ddca54ed2b44599
Parents: 4f6d586
Author: Joan Touzet 
Authored: Tue Aug 2 15:07:54 2016 -0400
Committer: Joan Touzet 
Committed: Tue Aug 2 15:07:54 2016 -0400

--
 dev/run | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6415cd17/dev/run
--
diff --git a/dev/run b/dev/run
index 2a9ca3f..a2646d2 100755
--- a/dev/run
+++ b/dev/run
@@ -243,11 +243,6 @@ def boot_haproxy(ctx):
 
 
 def hack_default_ini(ctx, node, content):
-# Replace log file
-logfile = toposixpath(os.path.join(ctx['devdir'], "logs", "%s.log" % node))
-repl = "file = %s" % logfile
-contents = re.sub("(?m)^file.*$", repl, content)
-
 # Replace couchjs command
 couchjs = os.path.join(ctx['rootdir'], "src", "couch", "priv", "couchjs")
 mainjs = os.path.join(ctx['rootdir'], "share", "server", "main.js")

couchdb commit: updated refs/heads/log-file-by-default to 4682404

2016-08-02 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/log-file-by-default [created] 46824041c


Change default to log to a file, not stderr


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

Branch: refs/heads/log-file-by-default
Commit: 46824041c4d0fdfe6917e0819d26eef2ae2846e8
Parents: 6415cd1
Author: Joan Touzet 
Authored: Tue Aug 2 15:25:48 2016 -0400
Committer: Joan Touzet 
Committed: Tue Aug 2 15:25:48 2016 -0400

--
 configure   | 22 --
 rel/overlay/etc/default.ini |  3 ++-
 2 files changed, 22 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/46824041/configure
--
diff --git a/configure b/configure
index 74c5787..ea3c0ec 100755
--- a/configure
+++ b/configure
@@ -22,6 +22,7 @@ basename=`basename $0`
 PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
 
 # TEST=0
+LOG_FILE="./var/log/couchdb.log"
 WITH_CURL="false"
 WITH_FAUXTON=1
 WITH_DOCS=1
@@ -43,7 +44,7 @@ Options:
   # --prefix=DIRECTORY  set the installation prefix (defaults to 
$DEFAULT_PREFIX)
   # --databasedir DIRECTORY specify the data directory (defaults to 
/var/lib/couchdb)
   # --viewindexdir DIRECTORYspecify the view directory (defaults to 
/var/lib/couchdb)
-  # --logdir DIRECTORY  specify the log file (defaults to 
/var/log/couchdb.log)
+  --logfile FILENAME  specify the log file (defaults to 
./var/log/couchdb.log)
   -c | --with-curlrequest that couchjs is linked to cURL (default 
false)
   --disable-fauxton   do not build Fauxton
   --disable-docs  do not build any documentation or manpages
@@ -138,12 +139,29 @@ parse_opts() {
 printf 'ERROR: "--user" requires a non-empty argument.\n' >&2
 exit 1
 ;;
+--logfile)
+if [ -n "$2" ]; then
+eval LOG_FILE=$2
+shift 2
+continue
+else
+printf 'ERROR: "--logfile" requires a non-empty 
argument.\n' >&2
+exit 1
+fi
+;;
+--logfile=?*)
+eval LOG_FILE=${1#*=}
+;;
+--logfile=)
+printf 'ERROR: "--logfile" requires a non-empty argument.\n' 
>&2
+exit 1
+;;
 --) # End of options
 shift
 break
 ;;
 -?*)
-echo "WARNING: Unkonwn option '$1', ignoring" >&2
+echo "WARNING: Unknown option '$1', ignoring" >&2
 shift
 ;;
 *) # Done

http://git-wip-us.apache.org/repos/asf/couchdb/blob/46824041/rel/overlay/etc/default.ini
--
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 5eeb938..2cc5b61 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -402,7 +402,8 @@ min_file_size = 131072
 ; here if you want to implement your own
 ; writer. See couch_log_writer.erl for
 ; more information on the (simple) API.
-writer = stderr
+writer = file
+file = {{log_file}}
 
 ; Options for the file writer
 ; file = /path/to/couch.log

couchdb commit: updated refs/heads/log-file-by-default to 7ab6f2f [Forced Update!]

2016-08-02 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/log-file-by-default 46824041c -> 7ab6f2fda (forced update)


Change default to log to a file, not stderr


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

Branch: refs/heads/log-file-by-default
Commit: 7ab6f2fda9568fca85ca0080149131215d153a0e
Parents: 6415cd1
Author: Joan Touzet 
Authored: Tue Aug 2 15:25:48 2016 -0400
Committer: Joan Touzet 
Committed: Tue Aug 2 15:32:25 2016 -0400

--
 configure   | 22 --
 configure.ps1   |  2 +-
 rel/overlay/etc/default.ini |  3 ++-
 3 files changed, 23 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7ab6f2fd/configure
--
diff --git a/configure b/configure
index 74c5787..ea3c0ec 100755
--- a/configure
+++ b/configure
@@ -22,6 +22,7 @@ basename=`basename $0`
 PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
 
 # TEST=0
+LOG_FILE="./var/log/couchdb.log"
 WITH_CURL="false"
 WITH_FAUXTON=1
 WITH_DOCS=1
@@ -43,7 +44,7 @@ Options:
   # --prefix=DIRECTORY  set the installation prefix (defaults to 
$DEFAULT_PREFIX)
   # --databasedir DIRECTORY specify the data directory (defaults to 
/var/lib/couchdb)
   # --viewindexdir DIRECTORYspecify the view directory (defaults to 
/var/lib/couchdb)
-  # --logdir DIRECTORY  specify the log file (defaults to 
/var/log/couchdb.log)
+  --logfile FILENAME  specify the log file (defaults to 
./var/log/couchdb.log)
   -c | --with-curlrequest that couchjs is linked to cURL (default 
false)
   --disable-fauxton   do not build Fauxton
   --disable-docs  do not build any documentation or manpages
@@ -138,12 +139,29 @@ parse_opts() {
 printf 'ERROR: "--user" requires a non-empty argument.\n' >&2
 exit 1
 ;;
+--logfile)
+if [ -n "$2" ]; then
+eval LOG_FILE=$2
+shift 2
+continue
+else
+printf 'ERROR: "--logfile" requires a non-empty 
argument.\n' >&2
+exit 1
+fi
+;;
+--logfile=?*)
+eval LOG_FILE=${1#*=}
+;;
+--logfile=)
+printf 'ERROR: "--logfile" requires a non-empty argument.\n' 
>&2
+exit 1
+;;
 --) # End of options
 shift
 break
 ;;
 -?*)
-echo "WARNING: Unkonwn option '$1', ignoring" >&2
+echo "WARNING: Unknown option '$1', ignoring" >&2
 shift
 ;;
 *) # Done

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7ab6f2fd/configure.ps1
--
diff --git a/configure.ps1 b/configure.ps1
index b9ed805..1fa9292 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -136,7 +136,7 @@ $CouchDBConfig = @"
 {prefix, "."}.
 {data_dir, "./data"}.
 {view_index_dir, "./data"}.
-{log_file, ""}.
+{log_file, "./var/log/couchdb.log"}.
 {fauxton_root, "./share/www"}.
 {user, "$CouchDBUser"}.
 {node_name, "-name couchdb@localhost"}.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7ab6f2fd/rel/overlay/etc/default.ini
--
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 5eeb938..2cc5b61 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -402,7 +402,8 @@ min_file_size = 131072
 ; here if you want to implement your own
 ; writer. See couch_log_writer.erl for
 ; more information on the (simple) API.
-writer = stderr
+writer = file
+file = {{log_file}}
 
 ; Options for the file writer
 ; file = /path/to/couch.log

documentation commit: updated refs/heads/master to 2614cfd

2016-09-02 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 9e03e2326 -> 2614cfda4


Rework view/query main section headings


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

Branch: refs/heads/master
Commit: 2614cfda40c363d60101b48f7fd9c219ed06d906
Parents: 9e03e23
Author: Joan Touzet 
Authored: Fri Sep 2 09:54:20 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 2 09:54:20 2016 -0400

--
 templates/pages/index.html | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/2614cfda/templates/pages/index.html
--
diff --git a/templates/pages/index.html b/templates/pages/index.html
index 0a1fd40..8c44f78 100644
--- a/templates/pages/index.html
+++ b/templates/pages/index.html
@@ -98,33 +98,33 @@ specific language governing permissions and limitations 
under the License.
   Guide to Views
 
 
-how to query JSON documents
+how to query documents with MapReduce
   
   
-
-  Replication
+
+  Mango Query Server
 
 
 
-  painless master-master data synchronization
+  simple JSON CouchDB queries without MapReduce
 
   
   
-
-  Design Documents
+
+  Replication
 
 
 
-  transform, update or validate your documents
+  painless master-master data synchronization
 
   
   
-
-  Mango Query Server
+
+  Design Documents
 
 
 
-  A MongoDB inspired query language interface for Apache CouchDB.
+  transform, update or validate your documents

documentation commit: updated refs/heads/master to 1c7e521

2016-09-02 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 1e5b636a2 -> 1c7e5217e


Add top-level link to clustering feature


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

Branch: refs/heads/master
Commit: 1c7e5217e6d5cf5851772fdbfedc03ee1a60edfd
Parents: 1e5b636
Author: Joan Touzet 
Authored: Fri Sep 2 02:20:37 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 2 02:20:37 2016 -0400

--
 templates/pages/index.html | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/1c7e5217/templates/pages/index.html
--
diff --git a/templates/pages/index.html b/templates/pages/index.html
index 7eadda9..26af88c 100644
--- a/templates/pages/index.html
+++ b/templates/pages/index.html
@@ -85,6 +85,13 @@ specific language governing permissions and limitations 
under the License.
 
 a short walk though the API
   
+  
+
+  Clustering
+
+
+setup and manage a cluster of nodes
+

[1/2] chttpd commit: updated refs/heads/master to 457bc2d

2016-09-02 Thread wohali 
Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master de784a580 -> 457bc2db7


Drop logging level for "no record of user %s"

This warning is tripped primarily when an admin is defined in local.ini
and has no associated _users document. This can happen fairly often in
development and testing setups, meaning that every other line in the
logfile is "no record of user admin".

The right thing to do here might be to check if the currently defined
user is a local admin and only complain in that situation, but presently
chttpd only directly depends on couch_auth_cache and to do so would 
require unencapsulating how couch_auth_cache handles ini file defined
admin users vs. authentication database users, which feels wrong.

Change suggested by @janl in #couchdb-dev IRC.

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

Branch: refs/heads/master
Commit: e01cc4098c312758025c830214385aa74cedd489
Parents: 35cb938
Author: Joan Touzet 
Authored: Thu Sep 1 23:58:37 2016 -0400
Committer: GitHub 
Committed: Thu Sep 1 23:58:37 2016 -0400

--
 src/chttpd_auth_cache.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/e01cc409/src/chttpd_auth_cache.erl
--
diff --git a/src/chttpd_auth_cache.erl b/src/chttpd_auth_cache.erl
index 5c06fb7..f3e69de 100644
--- a/src/chttpd_auth_cache.erl
+++ b/src/chttpd_auth_cache.erl
@@ -168,7 +168,7 @@ load_user_from_db(UserName) ->
{Props} = couch_doc:to_json_obj(Doc, []),
Props;
_Else ->
-   couch_log:warning("no record of user ~s", [UserName]),
+   couch_log:debug("no record of user ~s", [UserName]),
nil
 catch error:database_does_not_exist ->
nil

documentation commit: updated refs/heads/master to 84d5f4d

2016-09-02 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 4c0a3fad8 -> 84d5f4d1f


Top-level link to Mango documentation


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

Branch: refs/heads/master
Commit: 84d5f4d1fb3a527e32fc588b9afde76649e03ca7
Parents: 4c0a3fa
Author: Joan Touzet 
Authored: Fri Sep 2 07:25:14 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 2 07:25:14 2016 -0400

--
 templates/pages/index.html | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/84d5f4d1/templates/pages/index.html
--
diff --git a/templates/pages/index.html b/templates/pages/index.html
index 26af88c..0a1fd40 100644
--- a/templates/pages/index.html
+++ b/templates/pages/index.html
@@ -118,6 +118,15 @@ specific language governing permissions and limitations 
under the License.
   transform, update or validate your documents
 
   
+  
+
+  Mango Query Server
+
+
+
+  A MongoDB inspired query language interface for Apache CouchDB.
+
+

couchdb commit: updated refs/heads/master to d3748dd

2016-09-07 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 5859127ab -> d3748ddf6


Add friendly message to end of configure.ps1


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

Branch: refs/heads/master
Commit: d3748ddf69001c0fa1ae9073f093454402da0c55
Parents: 5859127
Author: Joan Touzet 
Authored: Wed Sep 7 07:07:39 2016 -0400
Committer: Joan Touzet 
Committed: Wed Sep 7 07:08:01 2016 -0400

--
 configure.ps1 | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d3748ddf/configure.ps1
--
diff --git a/configure.ps1 b/configure.ps1
index b9ed805..ee8638c 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -200,3 +200,4 @@ if ( (Test-Path .git -PathType Container) -and (-not 
$SkipDeps) ) {
 
 Pop-Location
 [Environment]::CurrentDirectory = $PWD
+Write-Verbose "You have configured Apache CouchDB, time to relax. Relax."

[2/2] documentation commit: updated refs/heads/master to 4c0a3fa

2016-09-02 Thread wohali 
Merge branch 'find' of https://github.com/willholley/couchdb-documentation


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

Branch: refs/heads/master
Commit: 4c0a3fad8cdc74445ccb8bad4f3c3d16b1a36167
Parents: 1c7e521 8a2993c
Author: Joan Touzet 
Authored: Fri Sep 2 07:22:19 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 2 07:22:19 2016 -0400

--
 src/api/database/find.rst  | 1001 +++
 src/api/database/index.rst |1 +
 2 files changed, 1002 insertions(+)
--

documentation commit: updated refs/heads/master to 9e03e23

2016-09-02 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 84d5f4d1f -> 9e03e2326


Fixing make check warnings


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

Branch: refs/heads/master
Commit: 9e03e2326225658ca56910d531899afe542decd7
Parents: 84d5f4d
Author: Joan Touzet 
Authored: Fri Sep 2 07:29:13 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 2 07:29:13 2016 -0400

--
 src/cluster/databases.rst   |  1 -
 src/install/troubleshooting.rst | 24 +++-
 src/install/unix.rst|  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9e03e232/src/cluster/databases.rst
--
diff --git a/src/cluster/databases.rst b/src/cluster/databases.rst
index aaf2807..819228f 100644
--- a/src/cluster/databases.rst
+++ b/src/cluster/databases.rst
@@ -75,4 +75,3 @@ be hosted on a new wiht the zone attribute set to 
``metro-dc-b``.
 Note that you can also use this system to ensure certain nodes in the cluster
 do not host *any* replicas for newly created databases, by giving them a zone
 attribute that does not appear in the ``[cluster]`` placement string.
-

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9e03e232/src/install/troubleshooting.rst
--
diff --git a/src/install/troubleshooting.rst b/src/install/troubleshooting.rst
index 085b623..fdf40ea 100644
--- a/src/install/troubleshooting.rst
+++ b/src/install/troubleshooting.rst
@@ -16,7 +16,6 @@
 Troubleshooting an Installation
 ===
 
-
 First Install
 =
 
@@ -24,7 +23,7 @@ If your CouchDB doesn't start after you've just installed, 
check the following
 things:
 
 - On UNIX-like systems, this is usually this is a permissions issue. Ensure
-  that you've followed the :ref:`install/unix/security` 
+  that you've followed the :ref:`install/unix/security`
   ``chown``/``chmod`` commands. This problem is indicated by the presence of
   the keyword ``eacces`` somewhere in the error output from CouchDB itself.
 - Some Linux distributions split up Erlang into multiple packages. For your
@@ -87,7 +86,7 @@ things:
 - At this point the only remaining dependency is your systems' unicode support
   library, ICU, and the Spidermonkey Javascript VM from Mozilla. Make sure that
   your ``LD_LIBRARY_PATH`` or similar for non-Linux systems
-  (``DYLD_LIBRARY_PATH`` on macOS) makes these available to CouchDB. 
+  (``DYLD_LIBRARY_PATH`` on macOS) makes these available to CouchDB.
   Linux example running as normal user:
 
 .. code-block:: text
@@ -100,7 +99,7 @@ things:
 
 echo LD_LIBRARY_PATH=/usr/local/lib:/usr/local/spidermonkey/lib couchdb | 
sudo -u couchdb sh
 
-- If you receive an error message including the key word ``eaddrinuse``, 
+- If you receive an error message including the key word ``eaddrinuse``,
   such as this:
 
 .. code-block:: text
@@ -181,7 +180,6 @@ run in IRC or the mailing list directly.
 
 8. Report back to the mailing list (or IRC) with the output of each step.
 
-
 Upgrading
 =
 
@@ -194,18 +192,18 @@ Runtime Errors
 
 Lots of memory being used on startup
 
-Is your CouchDB using a lot of memory (several hundred MB) on startup? This 
one 
+Is your CouchDB using a lot of memory (several hundred MB) on startup? This one
 seems to especially affect Dreamhost installs. It's really an issue with the
 Erlang VM pre-allocating data structures when ulimit is very large or
 unlimited. A detailed dicussion can be found on the erlang-questions list,
 but the short answer is that you should decrease ``ulimit -n`` or define
-``ERL_MAX_PORTS`` to something reasonable like 1024. 
+``ERL_MAX_PORTS`` to something reasonable like 1024.
 
 erlang stack trace contains ``system_limit``, ``open_port``
 ---
 Erlang has a default limit of 1024 ports, where each FD, tcp connection, and
 linked-in driver uses one port. You seem to have exceeded this. You can
-change it at runtime using the ``ERL_MAX_PORTS`` env variable. 
+change it at runtime using the ``ERL_MAX_PORTS`` env variable.
 
 function raised exception (Cannot encode 'undefined' value as JSON)
 ---
@@ -268,12 +266,12 @@ The function needs to return a value:
 erlang stack trace contains

[1/2] couchdb commit: updated refs/heads/master to 309c882

2016-09-02 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master eeab83242 -> 309c88218


Update default/local ini files with new settings

A comprehensive grep was run across the source code looking for
references to config:get* functions. This was used to remove any
config settings that no longer are used, and to add new defaults
set in the code explicitly to the ini files. Any newly added lines
were added only as *comments*.

One key change: local.ini still had the [httpd] block for port and
host bindings. As this applies to the "backend" binding and port
now, this section was renamed [chttpd] to ensure new users of 2.0
don't accidentally put their backend port on e.g. port 80.

Fixes COUCHDB-2623.


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

Branch: refs/heads/master
Commit: a10d9dc130700bfe63ac09ca630217582c288d97
Parents: 5e8041e
Author: Joan Touzet 
Authored: Fri Sep 2 02:03:40 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 2 02:13:15 2016 -0400

--
 rel/overlay/etc/default.ini | 112 +--
 rel/overlay/etc/local.ini   |   7 ++-
 2 files changed, 102 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a10d9dc1/rel/overlay/etc/default.ini
--
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 02dd392..952e1a7 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -30,12 +30,18 @@ attachment_stream_buffer_size = 4096
 ; admin_local - sharded dbs on :5984 are read/write for everyone,
 ;   local dbs on :5986 are read/write for admins only
 default_security = admin_local
+; btree_chunk_size = 1279
+; maintenance_mode = false
+; stem_interactive_updates = true
+; update_lru_on_read = true
+; uri_file =
 
 [cluster]
 q=8
 r=2
 w=2
 n=3
+; placement = metro-dc-a:2,metro-dc-b:1
 
 [chttpd]
 port = {{cluster_port}}
@@ -76,14 +82,60 @@ allow_jsonp = false
 ; For more socket options, consult Erlang's module 'inet' man page.
 ;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
 socket_options = [{recbuf, 262144}, {sndbuf, 262144}]
-log_max_chunk_size = 100
 enable_cors = false
 ; CouchDB can optionally enforce a maximum uri length;
 ; max_uri_length = 8000
+; changes_timeout = 6
+; config_whitelist = 
+; max_uri_length = 
+; rewrite_limit = 100
+; x_forwarded_host = X-Forwarded-Host
+; x_forwarded_proto = X-Forwarded-Proto
+; x_forwarded_ssl = X-Forwarded-Ssl
+
+; [httpd_design_handlers]
+; _view = 
+
+; [ioq]
+; concurrency = 10
+; ratio = 0.01
 
 [ssl]
 port = 6984
 
+; [chttpd_auth]
+; authentication_db = _users
+
+; [chttpd_auth_cache]
+; max_lifetime = 60
+; max_objects = 
+; max_size = 104857600
+
+; [mem3]
+; nodes_db = _nodes
+; shard_cache_size = 25000
+; shards_db = _dbs
+; sync_concurrency = 10
+
+; [fabric]
+; all_docs_concurrency = 10
+; changes_duration = 
+; shard_timeout_factor = 2
+; uuid_prefix_len = 7
+
+; [rexi]
+; buffer_count = 2000
+; server_per_node = false
+
+; [global_changes]
+; max_event_delay = 25
+; max_write_delay = 25
+; update_db = true
+
+; [view_updater]
+; min_writer_items = 100
+; min_writer_size = 16777216
+
 [couch_httpd_auth]
 authentication_db = _users
 authentication_redirect = /_utils/session.html
@@ -94,9 +146,12 @@ allow_persistent_cookies = false ; set to true to allow 
persistent cookies
 iterations = 10 ; iterations for password hashing
 ; min_iterations = 1
 ; max_iterations = 10
-
+; password_scheme = pbkdf2
+; proxy_use_secret = false
 ; comma-separated list of public fields, 404 if empty
 ; public_fields =
+; secret = 
+; users_db_public = false
 
 ; CSP (Content Security Policy) Support for _utils
 [csp]
@@ -162,8 +217,11 @@ query = {mango_native_proc, start_link, []}
 ; If you think you're hitting reduce_limit with a "good" reduce function,
 ; please let us know on the mailing list so we can fine tune the heuristic.
 [query_server_config]
+; commit_freq = 5
 reduce_limit = true
 os_process_limit = 25
+; os_process_idle_limit = 300
+; os_process_soft_limit = 100
 
 [daemons]
 index_server={couch_index_server, start_link, []}
@@ -233,6 +291,9 @@ _view_changes = {couch_mrview_http, handle_view_changes_req}
 ; alive if it exits.
 ; [os_daemons]
 ; some_daemon_name = /path/to/script -with args
+; [os_daemon_settings]
+; max_retries = 3
+; retry_time = 5
 
 
 [uuids]
@@ -254,12 +315,6 @@ utc_id_suffix =
 # Maximum number of UUIDs retrievable from /_uuids in a single request
 max_count = 1000
 
-[stats]
-; rate is in milliseconds
-rate = 1000

[2/2] couchdb commit: updated refs/heads/master to 309c882

2016-09-02 Thread wohali 
Merge branch '2623-update-ini-files' of https://github.com/wohali/couchdb


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

Branch: refs/heads/master
Commit: 309c8821891eb569e23aca5dfe79b28f103a991b
Parents: eeab832 a10d9dc
Author: Joan Touzet <woh...@apache.org>
Authored: Fri Sep 2 06:30:23 2016 -0400
Committer: Joan Touzet <woh...@apache.org>
Committed: Fri Sep 2 06:30:23 2016 -0400

--
 rel/overlay/etc/default.ini | 77 +++-
 rel/overlay/etc/local.ini   |  7 +++-
 2 files changed, 75 insertions(+), 9 deletions(-)
--

[2/2] chttpd commit: updated refs/heads/master to 457bc2d

2016-09-02 Thread wohali 
Merge branch '2.0-suppress-user-not-found-warning' of 
https://github.com/wohali/couchdb-chttpd


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

Branch: refs/heads/master
Commit: 457bc2db78c63e926ecbe9cf25ff2757903626a9
Parents: de784a5 e01cc40
Author: Joan Touzet <woh...@apache.org>
Authored: Fri Sep 2 06:29:02 2016 -0400
Committer: Joan Touzet <woh...@apache.org>
Committed: Fri Sep 2 06:29:02 2016 -0400

--
 src/chttpd_auth_cache.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

documentation commit: updated refs/heads/master to 1e5b636

2016-08-31 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master eb4eab621 -> 1e5b636a2


Add cluster placement reference info

Closes COUCHDB-2944


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

Branch: refs/heads/master
Commit: 1e5b636a25df9061ba9d6988435e9cdef2145fa4
Parents: eb4eab6
Author: Joan Touzet 
Authored: Wed Aug 31 14:47:24 2016 -0400
Committer: Joan Touzet 
Committed: Wed Aug 31 14:47:24 2016 -0400

--
 src/cluster/databases.rst | 35 +++
 1 file changed, 35 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/1e5b636a/src/cluster/databases.rst
--
diff --git a/src/cluster/databases.rst b/src/cluster/databases.rst
index f50cb45..aaf2807 100644
--- a/src/cluster/databases.rst
+++ b/src/cluster/databases.rst
@@ -41,3 +41,38 @@ Deleteing a database
 .. code-block:: bash
 
 curl -X DELETE "http://xxx.xxx.xxx.xxx:5984/database-name --user admin-user
+
+Placing a database on specific nodes
+
+
+In BigCouch, the predecessor to CouchDB 2.0's clustering functionality, there
+was the concept of zones. CouchDB 2.0 carries this forward with cluster
+placement rules.
+
+First, each node must be labelled with a zone attribute. This defines which
+zone each node is in. You do this by editing the node's document in the
+``/nodes`` database, which is accessed through the "back-door" (5986) port.
+Add a key value pair of the form:
+
+.. code-block:: text
+
+"zone": "metro-dc-a"
+
+Do this for all of the nodes in your cluster.
+
+In your config file (local.ini or default.ini) on each node, define a
+consistent cluster-wide setting like:
+
+.. code-block:: text
+
+[cluster]
+placement = metro-dc-a:2,metro-dc-b:1
+
+In this example, it will ensure that two replicas for a shard will be hosted
+on nodes with the zone attribute set to ``metro-dc-a`` and one replica will
+be hosted on a new wiht the zone attribute set to ``metro-dc-b``.
+
+Note that you can also use this system to ensure certain nodes in the cluster
+do not host *any* replicas for newly created databases, by giving them a zone
+attribute that does not appear in the ``[cluster]`` placement string.
+

documentation commit: updated refs/heads/master to 115e3ce

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master bc4bd9c8d -> 115e3ce45


linter errors


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

Branch: refs/heads/master
Commit: 115e3ce45fccb4ac1d9fb2ff574f7f71a7fc0e1b
Parents: bc4bd9c
Author: Joan Touzet 
Authored: Fri Sep 9 08:29:39 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 08:29:39 2016 -0400

--
 src/whatsnew/2.0.rst | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/115e3ce4/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index ce8fe57..82144af 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -40,12 +40,12 @@ Upgrade Notes
 Version 2.0.0
 =
 
-* Native clustering is now supported. Rather than use CouchDB replication 
between
-  multiple, distinct CouchDB servers, configure a cluster of CouchDB nodes. 
These
-  nodes will use an optimized Erlang-driven 'internal replication' to ensure
-  data durability and accessibility. Combine a clustered CouchDB with a load
-  balancer (such as ``haproxy``) to scale CouchDB out horizontally. More 
details
-  of the clustering feature are available in the :ref:`cluster`.
+* Native clustering is now supported. Rather than use CouchDB replication
+  between multiple, distinct CouchDB servers, configure a cluster of CouchDB
+  nodes. These nodes will use an optimized Erlang-driven 'internal replication'
+  to ensure data durability and accessibility. Combine a clustered CouchDB with
+  a load balancer (such as ``haproxy``) to scale CouchDB out horizontally. More
+  details of the clustering feature are available in the :ref:`cluster`.
 * `Futon` replaced by brand-new, completely re-engineered `Fauxton` interface.
   URL remains the same.
 * The new Mango Query Server provides a simple JSON-based way to perform 
CouchDB
@@ -55,8 +55,8 @@ Version 2.0.0
 * Rewrite rules of URLs can be performed using JavaScript.
 * Multiple queries can be made of a view with a single request.
 * Views can be queried with sorting turned off for a performance boost.
-* The update sequences returned by the :ref:`api/db/changes` feed are no 
longer just
-  integers. They can be any JSON value.
+* The update sequences returned by the :ref:`api/db/changes` feed are no longer
+  just integers. They can be any JSON value.
 * Enhanced global changes feed (now resumable/persistent)
 * New endpoints added (for some, documentation forthcoming):

documentation commit: updated refs/heads/master to 3804d19

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 7e7dcd2ec -> 3804d1930


Fix formatting in WhatsNew doc


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

Branch: refs/heads/master
Commit: 3804d1930fdb22c986d9b40841676805708f71e5
Parents: 7e7dcd2
Author: Joan Touzet 
Authored: Fri Sep 9 08:53:17 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 08:53:17 2016 -0400

--
 src/whatsnew/2.0.rst | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/3804d193/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index fad3a7b..4366838 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -27,14 +27,14 @@ Upgrade Notes
 
 * Temporary views are no longer supported.
 * It is possible to have multiple replicator databases.
-  `replicator/db` config option has been removed.
-  Instead `_replicator` and any database names ending
-  with `/_replicator` suffix will be recognized as
+  ``replicator/db`` config option has been removed.
+  Instead ``_replicator`` and any database names ending
+  with the ``/_replicator`` suffix will be recognized as
   replicator databases by the system.
 * Note that the semantics of some API calls have changed due to the 
introduction
   of the clustering feature. Specifically, make note of the difference between
-  receiving a `201` and a `202` when storing a document.
-* `all_or_nothing` is no longer supported by the :ref:`bulk_docs
+  receiving a ``201`` and a ``202`` when storing a document.
+* ``all_or_nothing`` is no longer supported by the :ref:`bulk_docs
   ` API
 
 .. _release/2.0.0:

documentation commit: updated refs/heads/master to c4e7cd9

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master b427c8b1f -> c4e7cd929


Futon -> Fauxton; remove Windows build instructions


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

Branch: refs/heads/master
Commit: c4e7cd92910e3940b2bde904b3bce2041c36bf9d
Parents: b427c8b
Author: Joan Touzet 
Authored: Fri Sep 9 10:30:12 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 10:30:12 2016 -0400

--
 src/api/server/common.rst|   4 +-
 src/config/http-handlers.rst |   2 +-
 src/config/http.rst  |   6 +-
 src/config/query-servers.rst |   7 +-
 src/couchapp/views/intro.rst |   4 +-
 src/install/windows.rst  | 192 +-
 src/intro/api.rst|   2 +-
 src/intro/futon.rst  | 178 ---
 src/intro/index.rst  |   3 +-
 src/intro/security.rst   |   8 +-
 src/intro/tour.rst   | 178 ---
 templates/pages/index.html   |   2 +-
 templates/utilities.html |   2 +-
 13 files changed, 76 insertions(+), 512 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c4e7cd92/src/api/server/common.rst
--
diff --git a/src/api/server/common.rst b/src/api/server/common.rst
index ac58401..debd856 100644
--- a/src/api/server/common.rst
+++ b/src/api/server/common.rst
@@ -952,13 +952,13 @@ is as follows:
 .. http:get:: /_utils
 :synopsis: Redirects to /_utils/
 
-Accesses the built-in Futon administration interface for CouchDB.
+Accesses the built-in Fauxton administration interface for CouchDB.
 
 :>header Location: New URI location
 :code 301: Redirects to :get:`/_utils/`
 
 .. http:get:: /_utils/
-:synopsis: CouchDB administration interface (Futon)
+:synopsis: CouchDB administration interface (Fauxton)
 
 :>header Content-Type: :mimetype:`text/html`
 :>header Last-Modified: Static files modification timestamp

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c4e7cd92/src/config/http-handlers.rst
--
diff --git a/src/config/http-handlers.rst b/src/config/http-handlers.rst
index 7124303..a59fc1a 100644
--- a/src/config/http-handlers.rst
+++ b/src/config/http-handlers.rst
@@ -117,7 +117,7 @@ Global HTTP Handlers
 
 .. config:option:: _utils
 
-The :ref:`_utils ` handler serves `Futon`'s web
+The :ref:`_utils ` handler serves `Fauxton`'s web
 administration page::
 
 [httpd_global_handlers]

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c4e7cd92/src/config/http.rst
--
diff --git a/src/config/http.rst b/src/config/http.rst
index b79eb7e..42d6275 100644
--- a/src/config/http.rst
+++ b/src/config/http.rst
@@ -253,10 +253,8 @@ Secure Socket Level Options
 shell> chmod 600 privkey.pem couchdb.pem
 shell> chown couchdb privkey.pem couchdb.pem
 
-Now, you need to edit CouchDB's configuration, either by editing your
-``local.ini`` file or using the ``/_config`` API calls or the
-configuration screen in Futon. Here is what you need to do in
-``local.ini``, you can infer what needs doing in the other places.
+Now, you need to edit CouchDB's configuration, by editing your
+``local.ini`` file. Here is what you need to do.
 
 At first, :option:`enable the HTTPS daemon `::
 

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c4e7cd92/src/config/query-servers.rst
--
diff --git a/src/config/query-servers.rst b/src/config/query-servers.rst
index 88f2344..85b267e 100644
--- a/src/config/query-servers.rst
+++ b/src/config/query-servers.rst
@@ -131,15 +131,12 @@ Native Erlang Query Server
 [native_query_servers]
 erlang = {couch_native_process, start_link, []}
 
-To see these changes you will also need to restart the server. To test out
-using :ref:`Erlang views `, visit the `Futon` admin
-interface, create a new database and open a temporary view. You should now
-be able to select ``erlang`` from the language drop-down.
+To see these changes you will also need to restart the server.
 
 Let's try an example of map/reduce functions which count the total
 documents at each number of revisions (there are x many documents at
 version "1", and

documentation commit: updated refs/heads/master to 122a25e

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master c4e7cd929 -> 122a25eac


linter cleanup


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

Branch: refs/heads/master
Commit: 122a25eac8d1cf119e9650e859bd7c61c2b9dc37
Parents: c4e7cd9
Author: Joan Touzet 
Authored: Fri Sep 9 10:37:07 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 10:37:07 2016 -0400

--
 src/intro/tour.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/122a25ea/src/intro/tour.rst
--
diff --git a/src/intro/tour.rst b/src/intro/tour.rst
index d328034..62ae59b 100644
--- a/src/intro/tour.rst
+++ b/src/intro/tour.rst
@@ -218,7 +218,7 @@ Click the green Create Document button to finalize creating 
the
 document.
 
 You can experiment with other JSON values; e.g., ``[1, 2, "c"]`` or
-``{"foo": "bar"}``. 
+``{"foo": "bar"}``.
 
 You'll notice that the document's _rev has been added. We'll go into more 
detail
 about this in later documents, but for now, the important thing to note is
@@ -400,7 +400,7 @@ First we'll need to create an empty database to be the 
target of replication.
 Return to the Databases overview and create a database called
 ``hello-replication``.  Now click "Replication" in the sidebar and choose
 hello-world as the source and hello-replication as the target. Click
-"Replicate" to replicate your database. 
+"Replicate" to replicate your database.
 
 To view the result of your replication, click on the Databases tab again.
 You should see the hello-replication database has the same number of documents

documentation commit: updated refs/heads/master to f0a5605

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master cb04aeb66 -> f0a560529


fix build


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

Branch: refs/heads/master
Commit: f0a560529b35830b4bc1d57291a386c88f4b9b6a
Parents: cb04aeb
Author: Joan Touzet 
Authored: Fri Sep 9 08:18:18 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 08:18:18 2016 -0400

--
 src/whatsnew/2.0.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f0a56052/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index 7fac616..9497162 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -45,7 +45,7 @@ Version 2.0.0
   nodes will use an optimized Erlang-driven 'internal replication' to ensure
   data durability and accessibility. Combine a clustered CouchDB with a load
   balancer (such as ``haproxy``) to scale CouchDB out horizontally. More 
details
-  of the clustering feature are available in the :ref:`cluster/index`.
+  of the clustering feature are available in the :ref:`cluster`.
 * `Futon` replaced by brand-new, completely re-engineered `Fauxton` interface.
   URL remains the same.
 * The new Mango Query Server provides a simple JSON-based way to perform 
CouchDB
@@ -54,7 +54,8 @@ Version 2.0.0
 * Rewrites rules of URLs can be performed using JavaScript.
 * Multiple queries can be made of a view with a single request.
 * Views can be queried with sorting turned off for a performance boost.
-* Database changes feed now takes any valid JSON object for update sequences.
+* The update sequences returned by the ``/db/_changes`` feed are no longer just
+  integers. They can be any JSON value.
 * Enhanced global changes feed (now resumable/persistent)
 * New endpoints added (for some, documentation forthcoming):

documentation commit: updated refs/heads/master to f36a82a

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 122a25eac -> f36a82a67


remove link to Futon from front page


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

Branch: refs/heads/master
Commit: f36a82a675ea49be919a5e66b82fa88fa4e6d663
Parents: 122a25e
Author: Joan Touzet 
Authored: Fri Sep 9 10:45:55 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 10:45:55 2016 -0400

--
 templates/pages/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f36a82a6/templates/pages/index.html
--
diff --git a/templates/pages/index.html b/templates/pages/index.html
index ede01f1..819e9d3 100644
--- a/templates/pages/index.html
+++ b/templates/pages/index.html
@@ -74,8 +74,7 @@ specific language governing permissions and limitations under 
the License.
   Tutorial
 
 
-start using CouchDB with
-  Fauxton and
+start using CouchDB with Fauxton and
   cURL

documentation commit: updated refs/heads/master to b427c8b

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 3804d1930 -> b427c8b1f


Add known issues for 2.0 release


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

Branch: refs/heads/master
Commit: b427c8b1f1cb5a42d0b85d0a63fbf680287bd7b7
Parents: 3804d19
Author: Joan Touzet 
Authored: Fri Sep 9 09:57:34 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 09:57:34 2016 -0400

--
 src/whatsnew/2.0.rst | 60 ---
 1 file changed, 52 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/b427c8b1/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index 4366838..6c4327b 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -54,14 +54,18 @@ Version 2.0.0
   queries without JavaScript or MapReduce. Further details are available in the
   :ref:`_find, _index and _explain API `.
 * Mango :ref:`selectors ` can be used in _changes
-  feeds instead of JavaScript MapReduce filters.
-* Rewrite rules of URLs can be performed using JavaScript.
-* Multiple queries can be made of a view with a single request.
-* Views can be queried with sorting turned off for a performance boost.
+  feeds instead of JavaScript MapReduce filters. Mango has been tested to be
+  up to an order of magnitude (10x) faster than JavaScript in this application.
+* :ref:`Rewrite rules ` for URLs can be performed using
+  JavaScript functions.
+* :ref:`Multiple queries ` can be made of a
+  view with a single HTTP request.
+* Views can be queried with sorting turned off ( ``sorted=false``) for a
+  performance boost.
 * The update sequences returned by the :ref:`api/db/changes` feed are no longer
   just integers. They can be any JSON value.
-* Enhanced global changes feed (now resumable/persistent)
-* New endpoints added (for some, documentation forthcoming):
+* The global changes feed has been enhanced. It is now resumable and 
persistent.
+* New endpoints added (documentation forthcoming for some):
 
   * :ref:`api/server/membership`
   * ``/_bulk_get``
@@ -73,5 +77,45 @@ Version 2.0.0
 * "Backend" interface on port 5986 used for specific cluster admin tasks. Of
   interest are the ``_nodes`` and ``_dbs`` databases visible only through this
   interface.
-* Support Erlang/OTP 17.x, 18.x and 19
-* New build system for Microsoft Windows
+* Support added for Erlang/OTP 17.x, 18.x and 19
+* New streamlined build system written for Microsoft Windows
+
+.. _release/2.0.x/knownissues:
+
+Known Issues
+
+
+All `known issues`_ filed against the 2.0 release are contained within the
+official `CouchDB JIRA instance`.
+
+The following are some highlights of known issues for which fixes did not land
+in time for the 2.0.0 release:
+
+* :issue:`2980`: The replicator (whether invoked via ``_replicate`` or a
+  document stored in the ``_replicator`` database) understands two kinds of
+  source and target:
+
+  #. A URL (e.g., ``https://foo:b...@foo.com/db1``), called a "remote" source 
or
+ target
+  #. A database name (e.g., ``db1``), called a "local" source or target.
+
+  Whenever the latter type is used, this refers to a local unclustered
+  database, not a clustered one.
+
+  In a future release we hope to support "local" source or target specs to
+  clustered databases. For now, we recommend always using the URL format for
+  both source and target specifications.
+* :issue:`3034`: CouchDB will occasionally return 500 errors when multiple
+  clients attempt to PUT or DELETE the same database concurrently.
+* :issue:`3119`: Adding nodes to a cluster fails if the Erlang node name
+  is not ``couchdb`` (of the form ``couchdb@hostname``.)
+* :issue:`3050`: Occasionally the ``dev/run`` script used for development
+  purposes to start a local 3-node cluster will fail to start one or more
+  nodes.
+* :issue:`2817`: The compaction daemon will only compact views for shards
+  that contain the design document.
+* :issue:`2804`: The fast_view optimization is not enabled on the clustered
+  interface.
+
+.. _known issues: https://s.apache.org/couchdb-2.0-known-issues
+.. _CouchDB JIRA instance: https://issues.apache.org/jira/browse/COUCHDB

documentation commit: updated refs/heads/master to bc4bd9c

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master f0a560529 -> bc4bd9c8d


fix inter-doc link


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

Branch: refs/heads/master
Commit: bc4bd9c8db45b0e31f54b4dd138db41efa432f65
Parents: f0a5605
Author: Joan Touzet 
Authored: Fri Sep 9 08:24:11 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 08:24:11 2016 -0400

--
 src/whatsnew/2.0.rst | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/bc4bd9c8/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index 9497162..ce8fe57 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -50,11 +50,12 @@ Version 2.0.0
   URL remains the same.
 * The new Mango Query Server provides a simple JSON-based way to perform 
CouchDB
   queries without JavaScript or MapReduce. Further details are available in the
-  :ref:`_find, _index and _explain API `.
-* Rewrites rules of URLs can be performed using JavaScript.
+  :ref:`_find, _index and _explain API `.
+* Mango selectors can be used in _changes feeds.
+* Rewrite rules of URLs can be performed using JavaScript.
 * Multiple queries can be made of a view with a single request.
 * Views can be queried with sorting turned off for a performance boost.
-* The update sequences returned by the ``/db/_changes`` feed are no longer just
+* The update sequences returned by the :ref:`api/db/changes` feed are no 
longer just
   integers. They can be any JSON value.
 * Enhanced global changes feed (now resumable/persistent)
 * New endpoints added (for some, documentation forthcoming):

documentation commit: updated refs/heads/master to 7e7dcd2

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master ab57e34d3 -> 7e7dcd2ec


Call out Mango selectors in 2.0 WhatsNew


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

Branch: refs/heads/master
Commit: 7e7dcd2ec7dad7b2b46832f9333808b842b26279
Parents: ab57e34
Author: Joan Touzet 
Authored: Fri Sep 9 08:44:22 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 08:45:05 2016 -0400

--
 src/whatsnew/2.0.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/7e7dcd2e/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index 2a3ac0c..fad3a7b 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -53,7 +53,8 @@ Version 2.0.0
 * The new Mango Query Server provides a simple JSON-based way to perform 
CouchDB
   queries without JavaScript or MapReduce. Further details are available in the
   :ref:`_find, _index and _explain API `.
-* Mango selectors can be used in _changes feeds.
+* Mango :ref:`selectors ` can be used in _changes
+  feeds instead of JavaScript MapReduce filters.
 * Rewrite rules of URLs can be performed using JavaScript.
 * Multiple queries can be made of a view with a single request.
 * Views can be queried with sorting turned off for a performance boost.

[2/2] documentation commit: updated refs/heads/master to 68a8798

2016-09-09 Thread wohali 
Merge branch 'row_spanning' of 
https://github.com/willholley/couchdb-documentation


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

Branch: refs/heads/master
Commit: 68a87981c5a87ead50668a100a136b2925099f01
Parents: f36a82a ff409d7
Author: Joan Touzet 
Authored: Fri Sep 9 11:10:04 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 11:10:04 2016 -0400

--
 src/api/database/find.rst | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)
--

couchdb commit: updated refs/heads/master to 83a3cef

2016-09-09 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 045ab4214 -> 83a3cef36


bump rebar.config for docs


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

Branch: refs/heads/master
Commit: 83a3cef3616b1444aea28c2a02155bbe50c3bcda
Parents: 045ab42
Author: Joan Touzet 
Authored: Fri Sep 9 11:26:52 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 11:26:52 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/83a3cef3/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index ff11813..851e508 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -38,7 +38,7 @@ DepDescs = [
 {couch_stats,  "couch-stats",  
"7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
 {couch_peruser,"peruser",  
"4eea9571171a5b41d832da32204a1122a01f4b0e"},
 {couch_tests,   "erlang-tests",
"37b3bfeb4b1a48a592456e67991362e155ed81e0"},
-{docs, "documentation",
"f36a82a675ea49be919a5e66b82fa88fa4e6d663", [raw]},
+{docs, "documentation",
"68a87981c5a87ead50668a100a136b2925099f01", [raw]},
 {ddoc_cache,   "ddoc-cache",   
"c762e90a33ce3cda19ef142dd1120f1087ecd876"},
 {ets_lru,  "ets-lru",  
"c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
 {fabric,   "fabric",   
"f84750e3d31accf7bcadb0ba05249c23ce920521"},

[1/2] documentation commit: updated refs/heads/master to 68a8798

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master f36a82a67 -> 68a87981c


Remove row-spanning in _find documentation

Man pages do not support table row spanning, so don't do it.


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

Branch: refs/heads/master
Commit: ff409d78ea302b16d9d96f71240d1752ec77cfc2
Parents: f36a82a
Author: Will Holley 
Authored: Fri Sep 9 15:57:53 2016 +0100
Committer: Will Holley 
Committed: Fri Sep 9 15:59:55 2016 +0100

--
 src/api/database/find.rst | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/ff409d78/src/api/database/find.rst
--
diff --git a/src/api/database/find.rst b/src/api/database/find.rst
index 90b796a..428c5b7 100644
--- a/src/api/database/find.rst
+++ b/src/api/database/find.rst
@@ -488,24 +488,24 @@ Other condition operators require the argument to be in a 
specific JSON format.
 
+===+=++===+
 | (In)equality  | ``$lt`` | Any JSON   | The field is less than the
|
 |   | || argument  
|
-|   
+-++---+
++---+-++---+
 |   | ``$lte``| Any JSON   | The field is less than or equal 
to|
 |   | || the argument. 
|
-|   
+-++---+
++---+-++---+
 |   | ``$eq`` | Any JSON   | The field is equal to the 
argument|
-|   
+-++---+
++---+-++---+
 |   | ``$ne`` | Any JSON   | The field is not equal to the 
|
 |   | || argument. 
|
-|   
+-++---+
++---+-++---+
 |   | ``$gte``| Any JSON   | The field is greater than or 
equal|
 |   | || to the argument.  
|
-|   
+-++---+
++---+-++---+
 |   | ``$gt`` | Any JSON   | The field is greater than the 
|
 |   | || to the argument.  
|
 
+---+-++---+
 | Object| ``$exists`` | Boolean| Check whether the field exists or 
|
 |   | || not, regardless of its value. 
|
-|   
+-++---+
++---+-++---+
 |   | ``$type``   | String | Check the document field's type.  
|
 |   | || Valid values are ``"null"``,  
|
 |   | || ``"boolean"``, ``"number"``,  
|
@@ -514,10 +514,10 @@ Other condition operators require the argument to be in a 
specific JSON format.
 
+---+-++---+
 | Array | ``$in`` | Array of   | The document field must exist in  
|
 |   | | JSON values| the list provided.
|
-|   
+-++---+
++---+-++---+
 |   | ``$nin``| Array of   | The document field not must exist 
|
 |   | | JSON values| in the list provided. 
|
-|   
+-++---+
++---+-++---+
 |   | ``$size``   | Integer| Special condition to match the
|
 |   | || length of an array field in a 
|
 |   |

couchdb-glazier git commit: Enable installation to drives other than boot

2016-09-14 Thread wohali 
Repository: couchdb-glazier
Updated Branches:
  refs/heads/master 7f0e8f8d3 -> 292c64739


Enable installation to drives other than boot


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

Branch: refs/heads/master
Commit: 292c64739e56f2da9c990a7d8dd287cb5b54dc9e
Parents: 7f0e8f8
Author: Joan Touzet 
Authored: Wed Sep 14 16:57:07 2016 -0400
Committer: Joan Touzet 
Committed: Wed Sep 14 16:57:07 2016 -0400

--
 installer/couchdb.wxs.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/292c6473/installer/couchdb.wxs.in
--
diff --git a/installer/couchdb.wxs.in b/installer/couchdb.wxs.in
index e5ebb94..7ea891c 100644
--- a/installer/couchdb.wxs.in
+++ b/installer/couchdb.wxs.in
@@ -27,11 +27,10 @@
EmbedCab="yes" />
 

-
+

-   
+

couchdb-glazier git commit: Enable installation to drives other than boot

2016-09-14 Thread wohali 
Repository: couchdb-glazier
Updated Branches:
  refs/heads/release/couchdb_2.0 a37eaad43 -> 4a12b87f9


Enable installation to drives other than boot


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

Branch: refs/heads/release/couchdb_2.0
Commit: 4a12b87f9e0e08f6d61e6fa9870e4f95536946a7
Parents: a37eaad
Author: Joan Touzet 
Authored: Wed Sep 14 16:57:07 2016 -0400
Committer: Joan Touzet 
Committed: Wed Sep 14 16:57:30 2016 -0400

--
 installer/couchdb.wxs.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/4a12b87f/installer/couchdb.wxs.in
--
diff --git a/installer/couchdb.wxs.in b/installer/couchdb.wxs.in
index e5ebb94..7ea891c 100644
--- a/installer/couchdb.wxs.in
+++ b/installer/couchdb.wxs.in
@@ -27,11 +27,10 @@
EmbedCab="yes" />
 

-
+

-   
+

documentation commit: updated refs/heads/master to cb04aeb

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master d40dcf11c -> cb04aeb66


Update What's New for 2.0


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

Branch: refs/heads/master
Commit: cb04aeb66b2cbf931a8fa97ce4f0e9bc7be431c5
Parents: d40dcf1
Author: Joan Touzet 
Authored: Fri Sep 9 08:09:03 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 08:09:03 2016 -0400

--
 .gitignore   |  2 ++
 src/whatsnew/2.0.rst | 37 +
 2 files changed, 35 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/cb04aeb6/.gitignore
--
diff --git a/.gitignore b/.gitignore
index feaaa9a..7077c00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 ext/*.pyc
 ext/__pycache__/
 build/
+*~
+*.swp

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/cb04aeb6/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index d318b3c..7fac616 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -25,19 +25,48 @@
 Upgrade Notes
 =
 
-.. note:: TBD
-
+* Temporary views are no longer supported.
 * It is possible to have multiple replicator databases.
   `replicator/db` config option has been removed.
   Instead `_replicator` and any database names ending
   with `/_replicator` suffix will be recognized as
   replicator databases by the system.
+* Note that the semantics of some API calls have changed due to the 
introduction
+  of the clustering feature. Specifically, make note of the difference between
+  receiving a `201` and a `202` when storing a document.
 
 .. _release/2.0.0:
 
 Version 2.0.0
 =
 
-.. note:: TBD
+* Native clustering is now supported. Rather than use CouchDB replication 
between
+  multiple, distinct CouchDB servers, configure a cluster of CouchDB nodes. 
These
+  nodes will use an optimized Erlang-driven 'internal replication' to ensure
+  data durability and accessibility. Combine a clustered CouchDB with a load
+  balancer (such as ``haproxy``) to scale CouchDB out horizontally. More 
details
+  of the clustering feature are available in the :ref:`cluster/index`.
+* `Futon` replaced by brand-new, completely re-engineered `Fauxton` interface.
+  URL remains the same.
+* The new Mango Query Server provides a simple JSON-based way to perform 
CouchDB
+  queries without JavaScript or MapReduce. Further details are available in the
+  :ref:`_find, _index and _explain API `.
+* Rewrites rules of URLs can be performed using JavaScript.
+* Multiple queries can be made of a view with a single request.
+* Views can be queried with sorting turned off for a performance boost.
+* Database changes feed now takes any valid JSON object for update sequences.
+* Enhanced global changes feed (now resumable/persistent)
+* New endpoints added (for some, documentation forthcoming):
+
+  * :ref:`api/server/membership`
+  * ``/_bulk_get``
+  * ``/_node/``
+  * ``/_cluster_setup``
+  * ``/_up``
+  * ``/db/_local_docs`` and ``/db/_design_docs`` (similar to ``/db/_all_docs``)
 
-* temporary views are no longer supported
+* "Backend" interface on port 5986 used for specific cluster admin tasks. Of
+  interest are the ``_nodes`` and ``_dbs`` databases visible only through this
+  interface.
+* Support Erlang/OTP 17.x, 18.x and 19
+* New build system for Microsoft Windows

couchdb commit: updated refs/heads/master to aae4ff7

2016-09-09 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master caa308f91 -> aae4ff745


Pull verify URL in from docs repo


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

Branch: refs/heads/master
Commit: aae4ff745dc31b96b7130b4e0b17026dec802937
Parents: caa308f
Author: Joan Touzet 
Authored: Fri Sep 9 02:34:08 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 02:34:08 2016 -0400

--
 INSTALL.Unix.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/aae4ff74/INSTALL.Unix.md
--
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index 9ff43bf..2b93c97 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -209,8 +209,9 @@ To check that everything has worked, point your web browser 
to:
 
 http://127.0.0.1:5984/_utils/
 
-From here you should click "Verify" then "Verify Installation" to
-validate CouchDB is working as expected.
+From here you should verify your installation by pointing your web browser to:
+
+http://localhost:5984/_utils/verify_install.html
 
 ## Running as a Daemon

documentation commit: updated refs/heads/master to d40dcf1

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master f9e06ed44 -> d40dcf11c


More Mac OS X install updates


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

Branch: refs/heads/master
Commit: d40dcf11c3113aaeb21f970324c1bf8649397a5c
Parents: f9e06ed
Author: Joan Touzet 
Authored: Fri Sep 9 02:52:17 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 02:52:17 2016 -0400

--
 src/install/mac.rst  | 102 +++---
 src/install/unix.rst |  26 ++--
 2 files changed, 28 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d40dcf11/src/install/mac.rst
--
diff --git a/src/install/mac.rst b/src/install/mac.rst
index c8af2c1..7f9f822 100644
--- a/src/install/mac.rst
+++ b/src/install/mac.rst
@@ -36,74 +36,20 @@ That's all, now CouchDB is installed on your Mac:
 
 #. Run Apache CouchDB application
 #. `Open up Fauxton`_, the CouchDB admin interface
+#. Verify the install by clicking on `Verify`, then `Verify Installation`.
 #. Time to Relax!
 
 .. _Open up Fauxton: http://localhost:5984/_utils
 
 .. _install/mac/homebrew:
 
-Installation with HomeBrew
+Installation with Homebrew
 ==
 
-You can install the build tools by running::
+The `Homebrew`_ build of CouchDB 2.0 is still in development. Check back often
+for updates.
 
-open /Applications/Installers/Xcode\ Tools/XcodeTools.mpkg
-
-To build CouchDB from source on Mac OS X, you will need to install
-the Command Line Tools::
-
-xcode-select --install
-
-You will need `Homebrew`_ installed to use the `brew` command. To install the
-other :ref:`dependencies ` run next commands::
-
-brew install autoconf autoconf-archive automake libtool \
-erlang icu4c spidermonkey curl pkg-config
-
-Now it's time to brew CouchDB::
-
-brew install couchdb
-
-The above Erlang install will use the bottled (pre-compiled) version if you 
are:
-using `/usr/local` for `homebrew`, and on 10.6 or 10.7. If you're not on one of
-these, `homebrew` will build from source, so consider doing::
-
-brew install erlang --no-docs
-
-to trim down compilation time.
-
-If you're hacking on CouchDB, and we hope you will, you may try the current
-git-based master (head) branch, or the next development release using this
-``couchdb`` recipe, using either ``--head`` or ``--devel`` options 
respectively.
-This will allow quick installation of the future release branch when it becomes
-active. If you're not sure if you need this, then you probably don't.
-In both cases we assume you are comfortable identifying bugs, and handling any
-potential upgrades between commits to the codebase. ::
-
-brew install [--devel|--head] couchdb
-
-.. note::
-OS X Lion might hang on the final brew.
-See the thread at https://github.com/mxcl/homebrew/issues/7024 it seems in
-most cases to be resolved by breaking out with ``CTRL-C`` and then 
repeating
-with ``brew install -v couchdb``.
-
-If you wish to have CouchDB run as a daemon then, set up the account,
-using the "User & Groups" preference pane:
-
-- Create a standard user `couchdb` with home directory as
-  `/usr/local/var/lib/couchdb`
-
-- Create a group called `couchdb` and add yourself, the `couchdb` user, and any
-  others you want to be able to edit config or db files directly to it.
-  Use the `advanced` group options to ensure the internal name is also 
correctly
-  called `couchdb`.
-
-Some versions of Mac OS X ship a problematic OpenSSL library. If you're
-experiencing troubles with CouchDB crashing intermittently with a segmentation
-fault or a bus error, you will need to install your own version of OpenSSL.
-
-.. _Homebrew: http://mxcl.github.com/homebrew/
+.. _Homebrew: http://brew.sh/
 
 Running as a Daemon
 ---
@@ -121,41 +67,3 @@ Naturally, you can configure launchd or other init daemons 
to
 launch CouchDB and keep it running using standard configuration files.
 
 Consult your system documentation for more information.
-
-.. _install/mac/macports:
-
-Installation from MacPorts
-==
-
-To install CouchDB using MacPorts you have 2 package choices:
-
-- ``couchdb`` - the latest release version
-- ``couchdb-devel`` - updated every few weeks with the latest from the master
-  branch
-
-::
-
-$ sudo port install couchdb
-
-should be enough. MacPorts takes care of installing all necessary dependencies.
-If you have already

documentation commit: updated refs/heads/master to 669a7d3

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master d0c36a7d2 -> 669a7d354


Port INSTALL.UNIX changes over from main repo


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

Branch: refs/heads/master
Commit: 669a7d3545156a5164e85ccb842d8c0a460fa990
Parents: d0c36a7
Author: Joan Touzet 
Authored: Fri Sep 9 02:32:51 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 02:33:04 2016 -0400

--
 src/install/mac.rst  |  62 +--
 src/install/unix.rst | 187 --
 2 files changed, 98 insertions(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/669a7d35/src/install/mac.rst
--
diff --git a/src/install/mac.rst b/src/install/mac.rst
index de786c8..c8af2c1 100644
--- a/src/install/mac.rst
+++ b/src/install/mac.rst
@@ -35,10 +35,10 @@ application. Just follow the below instructions:
 That's all, now CouchDB is installed on your Mac:
 
 #. Run Apache CouchDB application
-#. `Open up Futon`_, the CouchDB admin interface
+#. `Open up Fauxton`_, the CouchDB admin interface
 #. Time to Relax!
 
-.. _Open up Futon: http://localhost:5984/_utils
+.. _Open up Fauxton: http://localhost:5984/_utils
 
 .. _install/mac/homebrew:
 
@@ -49,26 +49,16 @@ You can install the build tools by running::
 
 open /Applications/Installers/Xcode\ Tools/XcodeTools.mpkg
 
-You will need `Homebrew`_ installed to use the `brew` command. To install the
-other :ref:`dependencies ` run next commands::
-
-brew install autoconf
-brew install autoconf-archive
-brew install automake
-brew install libtool
-brew install erlang
-brew install icu4c
-brew install spidermonkey
-brew install curl
+To build CouchDB from source on Mac OS X, you will need to install
+the Command Line Tools::
 
-You may want to link ICU so that CouchDB can find the header files
-automatically::
+xcode-select --install
 
-brew link icu4c
-
-The same is true for recent versions of Erlang::
+You will need `Homebrew`_ installed to use the `brew` command. To install the
+other :ref:`dependencies ` run next commands::
 
-brew link erlang
+brew install autoconf autoconf-archive automake libtool \
+erlang icu4c spidermonkey curl pkg-config
 
 Now it's time to brew CouchDB::
 
@@ -118,33 +108,17 @@ fault or a bus error, you will need to install your own 
version of OpenSSL.
 Running as a Daemon
 ---
 
-You can use the `launchctl` command to control the CouchDB daemon.
-
-You can load the configuration by running::
-
-sudo launchctl load \
- /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
+CouchDB no longer ships with any daemonization scripts.
 
-You can stop the CouchDB daemon by running::
-
-sudo launchctl unload \
- /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
-
-You can start CouchDB by running::
-
-sudo launchctl start org.apache.couchdb
-
-You can restart CouchDB by running::
-
-sudo launchctl stop org.apache.couchdb
-
-You can edit the launchd configuration by running::
-
-open /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
+You can use the `launchctl` command to control the CouchDB daemon.
 
-To start the daemon on boot, copy the configuration file to::
+The couchdb team recommends `runit `_ to
+run CouchDB persistently and reliably. Configuration of runit is
+straightforward; if you have questions, reach out to the CouchDB
+user mailing list.
 
-/Library/LaunchDaemons
+Naturally, you can configure launchd or other init daemons to
+launch CouchDB and keep it running using standard configuration files.
 
 Consult your system documentation for more information.
 
@@ -176,7 +150,7 @@ the launchd configuration which comes with the project, 
with this command::
 
 $ sudo port load couchdb
 
-and it should be up and accessible via Futon at http://127.0.0.1:5984/_utils.
+and it should be up and accessible via Fauxton at http://127.0.0.1:5984/_utils.
 It should also be restarted automatically after reboot.
 
 Updating the ports collection. The collection of port files has to be updated

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/669a7d35/src/install/unix.rst
--
diff --git a/src/install/unix.rst b/src/install/unix.rst
index 028d3d2..208010a 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@

documentation commit: updated refs/heads/master to f9e06ed

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 669a7d354 -> f9e06ed44


fix syntax and linter errors


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

Branch: refs/heads/master
Commit: f9e06ed44996523498d63aa1dbcda7d3c0e26a89
Parents: 669a7d3
Author: Joan Touzet 
Authored: Fri Sep 9 02:41:59 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 02:41:59 2016 -0400

--
 src/install/unix.rst | 42 ++
 1 file changed, 18 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f9e06ed4/src/install/unix.rst
--
diff --git a/src/install/unix.rst b/src/install/unix.rst
index 208010a..e76efd8 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -45,8 +45,8 @@ It is recommended that you install Erlang OTP R16B03-1 or 
above where possible.
 You will only need libcurl if you plan to run the JavaScript test suite. And
 help2man is only need if you plan on installing the CouchDB man pages.
 Python and Sphinx are only required for building the online documentation.
-Documentation build can be disabled by adding the `--disable-docs` flag to
-the `configure` script.
+Documentation build can be disabled by adding the ``--disable-docs`` flag to
+the ``configure`` script.
 
 .. seealso::
 
@@ -80,13 +80,14 @@ distributions, it's recommended to use a more recent 
js-devel-1.8.5.
 Mac OS X
 
 
-Follow :ref:`install/mac/homebrew` reference till `brew install couchdb` step.
+Follow :ref:`install/mac/homebrew` reference till ``brew install couchdb``
+step.
 
 FreeBSD
 ---
 
-FreeBSD requires the use of GNU Make. Where `make` is specified in this
-documentation, substitute `gmake`.
+FreeBSD requires the use of GNU Make. Where ``make`` is specified in this
+documentation, substitute ``gmake``.
 
 You can install this by running::
 
@@ -99,7 +100,7 @@ Once you have satisfied the dependencies you should run::
 
 ./configure
 
-If you wish to customize the installation, pass `--help` to this script.
+If you wish to customize the installation, pass ``--help`` to this script.
 
 If everything was successful you should see the following message::
 
@@ -107,19 +108,11 @@ If everything was successful you should see the following 
message::
 
 Relax.
 
-To install CouchDB you should run::
-
-make && sudo make install
-
-You only need to use `sudo` if you're installing into a system directory.
-
-Try `gmake` if `make` is giving you any problems.
-
 To build CouchDB you should run::
 
 make release
 
-Try `gmake` if `make` is giving you any problems.
+Try ``gmake`` if ``make`` is giving you any problems.
 
 If everything was successful you should see the following message::
 
@@ -134,9 +127,10 @@ Relax.
 User Registration and Security
 ==
 
-For OS X, in the steps below, substitute `/Users/couchdb` for `/home/couchdb`.
+For OS X, in the steps below, substitute ``/Users/couchdb`` for 
+``/home/couchdb``.
 
-You should create a special `couchdb` user for CouchDB.
+You should create a special ``couchdb`` user for CouchDB.
 
 On many Unix-like systems you can run::
 
@@ -156,13 +150,13 @@ You must make sure that:
 
 * The user has a working POSIX shell
 * The user's home directory is wherever you have copied the release.
-  As a recommendation, copy the `rel\couchdb` directory into
-  `/home/couchdb` or `/Users/couchdb`.
+  As a recommendation, copy the ``rel/couchdb`` directory into
+  ``/home/couchdb`` or ``/Users/couchdb``.
 
 You can test this by:
 
-* Trying to log in as the `couchdb` user
-* Running `pwd` and checking the present working directory
+* Trying to log in as the ``couchdb`` user
+* Running ``pwd`` and checking the present working directory
 
 Copy the built couchdb release to the new user's home directory::
 
@@ -170,7 +164,7 @@ Copy the built couchdb release to the new user's home 
directory::
 
 Change the ownership of the CouchDB directories by running::
 
-chown -R couchdb:couchdb /home/couchdb/couchdb 
+chown -R couchdb:couchdb /home/couchdb/couchdb
 
 Change the permission of the CouchDB directories by running::
 
@@ -187,7 +181,8 @@ You can start the CouchDB server by running::
 
 sudo -i -u couchdb couchdb/bin/couchdb
 
-This uses the `sudo` command to run the `couchdb` command as the `couchdb` 
user.
+This uses the ``sudo`` command to run the ``couchdb`` command as the
+``couchdb`` user.
 
 When CouchDB starts it should

couchdb commit: updated refs/heads/master to 248c465

2016-09-08 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 0715db5e1 -> 248c46593


Update UNIX install instructions


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

Branch: refs/heads/master
Commit: 248c4659328e7d228b3df5001d06f61f8ca5c923
Parents: 0715db5
Author: Joan Touzet 
Authored: Thu Sep 8 23:19:13 2016 -0400
Committer: Joan Touzet 
Committed: Thu Sep 8 23:19:13 2016 -0400

--
 INSTALL.Unix.md | 188 ++-
 1 file changed, 49 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/248c4659/INSTALL.Unix.md
--
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index 643dddb..65f2c0b 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -1,5 +1,4 @@
-Apache CouchDB INSTALL.Unix
-==
+# Apache CouchDB INSTALL.Unix
 
 A high-level guide to Unix-like systems, inc. Mac OS X and Ubuntu.
 
@@ -17,8 +16,7 @@ update their archives. If you're running into trouble, be 
sure to
 check out the wiki. If you have any tips to share, please also update
 the wiki so that others can benefit from your experience.
 
-Troubleshooting

+## Troubleshooting
 
 There is a troubleshooting guide:
 
@@ -34,8 +32,7 @@ There are collection of friendly mailing lists:
 
 Please work through these in order if you experience any problems.
 
-Dependencies
-
+## Dependencies
 
 You should have the following installed:
 
@@ -54,10 +51,14 @@ It is recommended that you install Erlang OTP R16B03-1 or 
above where
 possible.  You will only need libcurl if you plan to run the
 JavaScript test suite. And help2man is only need if you plan on
 installing the CouchDB man pages.  Python and Sphinx are only required
-for building the online documentation.
+for building the online documentation. Documentation build can be disabled
+by adding the `--disable-docs` flag to the `configure` script.
 
-Debian-based Systems
-
+For up to date instructions, please see:
+
+  https://cwiki.apache.org/confluence/display/COUCHDB/Installing+CouchDB
+
+### Debian-based Systems
 
 You can install the dependencies by running:
 
@@ -68,31 +69,16 @@ You can install the dependencies by running:
 Be sure to update the version numbers to match your system's available
 packages.
 
-For up to date instructions, please see:
-
-  http://wiki.apache.org/couchdb/Installing_on_Debian
-
-  http://wiki.apache.org/couchdb/Installing_on_Ubuntu
-
-Unfortunately, it seems that installing dependencies on Ubuntu is
-troublesome.
-
-RedHat-based (Fedora, Centos, RHEL) Systems
-~~~
+### RedHat-based (Fedora, Centos, RHEL) Systems
 
 You can install the dependencies by running:
 
 sudo yum install autoconf autoconf-archive automake \
 curl-devel erlang-asn1 erlang-erts erlang-eunit \
 erlang-os_mon erlang-xmerl help2man \
-js-devel libicu-devel libtool perl-Test-Harness
-
-While CouchDB builds against the default js-devel-1.7.0 included in
-some distributions, it's recommended to use a more recent
-js-devel-1.8.5.
+js-devel-1.8.5 libicu-devel libtool perl-Test-Harness
 
-Mac OS X
-
+### Mac OS X
 
 To build CouchDB from source on Mac OS X, you will need to install
 the Command Line Tools:
@@ -113,11 +99,9 @@ Learn more about Homebrew at:
 Some versions of Mac OS X ship a problematic OpenSSL library. If
 you're experiencing troubles with CouchDB crashing intermittently with
 a segmentation fault or a bus error, you will need to install your own
-version of OpenSSL. See the troubleshooting guide, mentioned above,
-for more information.
+version of OpenSSL. See the wiki, mentioned above, for more information.
 
-FreeBSD

+### FreeBSD
 
 FreeBSD requires the use of GNU Make. Where `make` is specified in this
 documentation, substitute `gmake`.
@@ -126,8 +110,7 @@ You can install this by running:
 
 pkg install gmake
 
-Installing
---
+## Installing
 
 Once you have satisfied the dependencies you should run:
 
@@ -145,43 +128,43 @@ If everything was successful you should see the following 
message:
 
 Relax.
 
-To install CouchDB you should run:
+To build CouchDB you should run:
 
-make && sudo make install
-
-You only need to use `sudo` if you're installing into a system directory.
+make release
 
 Try `gmake` if `make` is giving you any problems.
 
 If everything was successful you should see the following message:
 
-You have installed Apache CouchDB, time to relax.
+... done
+

couchdb commit: updated refs/heads/master to 8713951

2016-09-08 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 248c46593 -> 87139518c


Remove reference to /usr/local in UNIX install instructions


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

Branch: refs/heads/master
Commit: 87139518cfd9689099d608872895af56891997eb
Parents: 248c465
Author: Joan Touzet 
Authored: Thu Sep 8 23:23:25 2016 -0400
Committer: Joan Touzet 
Committed: Thu Sep 8 23:23:25 2016 -0400

--
 INSTALL.Unix.md | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/87139518/INSTALL.Unix.md
--
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index 65f2c0b..bbadcbb 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -116,9 +116,6 @@ Once you have satisfied the dependencies you should run:
 
 ./configure
 
-This script will configure CouchDB to be installed into `/usr/local`
-by default.
-
 If you wish to customize the installation, pass `--help` to this
 script.

couchdb commit: updated refs/heads/master to caa308f

2016-09-08 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 87139518c -> caa308f91


Further OSX specific updates to install doc


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

Branch: refs/heads/master
Commit: caa308f91cac6bfd6026d64fe1bf27482f55b513
Parents: 8713951
Author: Joan Touzet 
Authored: Thu Sep 8 23:53:18 2016 -0400
Committer: Joan Touzet 
Committed: Thu Sep 8 23:53:18 2016 -0400

--
 INSTALL.Unix.md | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/caa308f9/INSTALL.Unix.md
--
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index bbadcbb..9ff43bf 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -141,6 +141,8 @@ Relax.
 
 ## User Registration
 
+For OS X, in the steps below, substitute `/Users/couchdb` for `/home/couchdb`.
+
 You should create a special `couchdb` user for CouchDB.
 
 On many Unix-like systems you can run:
@@ -151,9 +153,11 @@ On many Unix-like systems you can run:
 --group --gecos \
 "CouchDB Administrator" couchdb
 
-On Mac OS X you can use the Workgroup Manager to create users. Links to
-download the Workgroup Manager vary by OS version; search Apple's support
-site to find the download appropriate for your system.
+On Mac OS X you can use the Workgroup Manager to create users up to version
+10.9, and dscl or sysadminctl after version 10.9. Search Apple's support
+site to find the documentation appropriate for your system. As of recent
+versions of OS X, this functionality is also included in Server.app,
+available through the App Store only as part of OS X Server.
 
 You must make sure that:
 
@@ -161,7 +165,7 @@ You must make sure that:
 
 * The user's home directory is wherever you have copied the release.
   As a recommendation, copy the `rel\couchdb` directory into
-  `/home/couchdb`.
+  `/home/couchdb` or `/Users/couchdb`.
 
 You can test this by:
 
@@ -175,7 +179,7 @@ Copy the built couchdb release to the new user's home 
directory:
 
 Change the ownership of the CouchDB directories by running:
 
-chown -R couchdb:couchdb /home/couchdb/couchdb
+chown -R couchdb:couchdb /home/couchdb/couchdb 
 
 Change the permission of the CouchDB directories by running:

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

2016-09-12 Thread 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 <woh...@atypical.net>
Authored: Mon Sep 12 15:52:51 2016 -0400
Committer: Joan Touzet <woh...@atypical.net>
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(-)
--

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

2016-09-12 Thread 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,

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

2016-09-12 Thread 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"},

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

2016-09-12 Thread 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/2.0.x to ef3c678

2016-09-12 Thread 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/master to 4b19f62

2016-09-09 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master eb3f941fb -> 4b19f6223


bump docs repo


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

Branch: refs/heads/master
Commit: 4b19f6223562ed8cbee7d16689ae4c7760e924d7
Parents: eb3f941
Author: Joan Touzet 
Authored: Fri Sep 9 15:55:45 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 15:55:45 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/4b19f622/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 8c8dc2c..c4f3fbe 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -38,7 +38,7 @@ DepDescs = [
 {couch_stats,  "couch-stats",  
"7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
 {couch_peruser,"peruser",  
"4eea9571171a5b41d832da32204a1122a01f4b0e"},
 {couch_tests,   "erlang-tests",
"37b3bfeb4b1a48a592456e67991362e155ed81e0"},
-{docs, "documentation",
"0f3512b95795887be0bac074b07148642b29067c", [raw]},
+{docs, "documentation",
"9397537579cfe53d7bf5cb3df35410cfddedb739", [raw]},
 {ddoc_cache,   "ddoc-cache",   
"c762e90a33ce3cda19ef142dd1120f1087ecd876"},
 {ets_lru,  "ets-lru",  
"c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
 {fabric,   "fabric",   
"f84750e3d31accf7bcadb0ba05249c23ce920521"},

documentation commit: updated refs/heads/master to 9397537

2016-09-09 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 0f3512b95 -> 939753757


linter fix


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

Branch: refs/heads/master
Commit: 9397537579cfe53d7bf5cb3df35410cfddedb739
Parents: 0f3512b
Author: Joan Touzet 
Authored: Fri Sep 9 15:54:38 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 15:54:38 2016 -0400

--
 src/whatsnew/2.0.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/93975375/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index 60cce20..142737e 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -64,7 +64,8 @@ Version 2.0.0
   interest are the ``_nodes`` and ``_dbs`` databases visible only through this
   interface.
 * Support added for Erlang/OTP 17.x, 18.x and 19
-* New streamlined build system written for Unix-like systems and Microsoft 
Windows
+* New streamlined build system written for Unix-like systems and Microsoft
+  Windows
 
 .. _release/2.0.x/upgrade:

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

2016-09-11 Thread wohali 
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 100241c18 -> 3fed6863a


Disable should_process_waiting_queue_as_fifo test

COUCHDB-3140

This PR disables the problematic queue-as-fifo test. As written, any
call in a test to spawn_client/1 returns immediately, and does not
guarantee that the call to couch_query_servers:get_ddoc_process/2
returns before control flow proceeds to the next line in the eunit test.
As it turns out, on Windows, the call to spawn_client for ddoc5 succeeds
prior to the ddoc4 call in this test, thus always failing.

Insertion of a timer:sleep/1 call between the spawn_client/1 calls seems
to solve the problem, but even this is "lucky" behaviour. Semantically
the way this test is written, with spawn_client/1 using spawn/1 to spin
off the actual get_ddoc_process/2 call, there is no guarantee that the
couch_proc_manager FIFO queue is being populated correctly.

Further, if the get_ddoc_process/2 call takes longer than the defined
timeout (5000 ms) this test will always fail, as no provision is made to
keep trying for an os_process after that time. Again we are "lucky" that
the test runs fast enough that this is not a problem, but relying on a
performant BEAM VM for test success in any regard is equally
problematic.

For this reason I am completely commenting out this test until the
harness can be fixed. I believe the impact to couchdb is minimal.

(It also suggests we may want to rethink how requests for os processes
are queued and issued at some point in the future; this approach seems
sub-optimal, especially if strict FIFO ordering is an expectation of the
system.)

/cc @eiri @rnewson @janl


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

Branch: refs/heads/master
Commit: ac7435c334eae2b8454fa6d0b6a1154bca8f6874
Parents: 100241c
Author: Joan Touzet 
Authored: Sun Sep 11 02:24:40 2016 -0400
Committer: Joan Touzet 
Committed: Sun Sep 11 02:24:40 2016 -0400

--
 test/couchdb_os_proc_pool.erl | 59 +++---
 1 file changed, 30 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/ac7435c3/test/couchdb_os_proc_pool.erl
--
diff --git a/test/couchdb_os_proc_pool.erl b/test/couchdb_os_proc_pool.erl
index 54d19f0..f14af68 100644
--- a/test/couchdb_os_proc_pool.erl
+++ b/test/couchdb_os_proc_pool.erl
@@ -38,7 +38,7 @@ os_proc_pool_test_() ->
 should_block_new_proc_on_full_pool(),
 should_free_slot_on_proc_unexpected_exit(),
 should_reuse_known_proc(),
-should_process_waiting_queue_as_fifo(),
+%should_process_waiting_queue_as_fifo(),
 should_reduce_pool_on_idle_os_procs()
 ]
 }
@@ -148,34 +148,35 @@ should_reuse_known_proc() ->
 end).
 
 
-should_process_waiting_queue_as_fifo() ->
-?_test(begin
-Client1 = spawn_client(<<"ddoc1">>),
-Client2 = spawn_client(<<"ddoc2">>),
-Client3 = spawn_client(<<"ddoc3">>),
-Client4 = spawn_client(<<"ddoc4">>),
-Client5 = spawn_client(<<"ddoc5">>),
-
-?assertEqual(ok, ping_client(Client1)),
-?assertEqual(ok, ping_client(Client2)),
-?assertEqual(ok, ping_client(Client3)),
-?assertEqual(timeout, ping_client(Client4)),
-?assertEqual(timeout, ping_client(Client5)),
-
-Proc1 = get_client_proc(Client1, "1"),
-?assertEqual(ok, stop_client(Client1)),
-?assertEqual(ok, ping_client(Client4)),
-Proc4 = get_client_proc(Client4, "4"),
-
-?assertNotEqual(Proc4#proc.client, Proc1#proc.client),
-?assertEqual(Proc1#proc.pid, Proc4#proc.pid),
-?assertEqual(timeout, ping_client(Client5)),
-
-?assertEqual(ok, stop_client(Client2)),
-?assertEqual(ok, stop_client(Client3)),
-?assertEqual(ok, stop_client(Client4)),
-?assertEqual(ok, stop_client(Client5))
-end).
+%should_process_waiting_queue_as_fifo() ->
+%?_test(begin
+%Client1 = spawn_client(<<"ddoc1">>),
+%Client2 = spawn_client(<<"ddoc2">>),
+%Client3 = spawn_client(<<"ddoc3">>),
+%Client4 = spawn_client(<<"ddoc4">>),
+%timer:sleep(100),
+%Client5 = spawn_client(<<"ddoc5">>),
+%
+%?assertEqual(ok, ping_client(Client1)),
+%?assertEqual(ok, ping_client(Client2)),
+%?assertEqual(ok, ping_client(Client3)),
+%?assertEqual(timeout, ping_client(Client4)),
+%

  1   2   3   4   5   6   7   8   9   10   >