couchdb commit: updated refs/heads/master to f6fb04e

[jan]

Repository: couchdb
Updated Branches:
  refs/heads/master cedb69c5e -> f6fb04e55


feat: update to latest couch, fix path issue


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

Branch: refs/heads/master
Commit: f6fb04e55be710e21668f0c3101cd2f5eff415b4
Parents: cedb69c
Author: Jan Lehnardt 
Authored: Wed Aug 31 21:40:23 2016 +0200
Committer: Jan Lehnardt 
Committed: Wed Aug 31 21:40:23 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/f6fb04e5/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 48d5690..3fd6a18 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -29,7 +29,7 @@ DepDescs = [
 {b64url,   "b64url",   
"6895652d80f95cdf04efb14625abed868998f174"},
 {couch_log,"couch-log",
"ad803f66dbd1900b67543259142875a6d03503ce"},
 {chttpd,   "chttpd",   
"9e0ad343cab5ef652c3e0224da661c4343c146a3"},
-{couch,"couch",
"b8b4982f4d591553a5e1cb3bdb56907ee74824ac"},
+{couch,"couch",
"f122f94291bfbc87496efca3c04540bb190b985a"},
 {couch_index,  "couch-index",  
"ee21d0181f0879bf9ab2dc6d67cc5c26c7c76628"},
 {couch_mrview, "couch-mrview", 
"9133f6d1612374e73f18f13244a32ce8678aab67"},
 {couch_replicator, "couch-replicator", 
"0248d231d2c9903611d401fc9fc5f9f63960ee7f"},

couch commit: updated refs/heads/master to f122f94

[jan]

Repository: couchdb-couch
Updated Branches:
  refs/heads/master b8b4982f4 -> f122f9429


feat: allow couchspawnkillable to live in directories with spaces


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

Branch: refs/heads/master
Commit: f122f94291bfbc87496efca3c04540bb190b985a
Parents: b8b4982
Author: Jan Lehnardt 
Authored: Wed Aug 31 21:39:13 2016 +0200
Committer: Jan Lehnardt 
Committed: Wed Aug 31 21:39:13 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f122f942/src/couch_os_process.erl
--
diff --git a/src/couch_os_process.erl b/src/couch_os_process.erl
index 4f1..5852233 100644
--- a/src/couch_os_process.erl
+++ b/src/couch_os_process.erl
@@ -146,7 +146,7 @@ pick_command1(_) ->
 % gen_server API
 init([Command, Options, PortOptions]) ->
 PrivDir = couch_util:priv_dir(),
-Spawnkiller = filename:join(PrivDir, "couchspawnkillable"),
+Spawnkiller = "\"" ++ filename:join(PrivDir, "couchspawnkillable") ++ "\"",
 V = config:get("query_server_config", "os_process_idle_limit", "300"),
 IdleLimit = list_to_integer(V) * 1000,
 BaseProc = #os_proc{

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

[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.
+

couchdb commit: updated refs/heads/master to cedb69c

[jan]

Repository: couchdb
Updated Branches:
  refs/heads/master 487df372d -> cedb69c5e


fix: quote paths in startup script, to allow location independent starts


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

Branch: refs/heads/master
Commit: cedb69c5ed415dbe837de21f86dff7fbb9f39e4b
Parents: 487df37
Author: Jan Lehnardt 
Authored: Wed Aug 31 10:36:53 2016 +0200
Committer: Jan Lehnardt 
Committed: Wed Aug 31 10:36:53 2016 +0200

--
 rel/overlay/bin/couchdb | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cedb69c5/rel/overlay/bin/couchdb
--
diff --git a/rel/overlay/bin/couchdb b/rel/overlay/bin/couchdb
index f64bd44..1669291 100755
--- a/rel/overlay/bin/couchdb
+++ b/rel/overlay/bin/couchdb
@@ -12,20 +12,20 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-COUCHDB_BIN_DIR=$(cd ${0%/*} && pwd)
+COUCHDB_BIN_DIR=$(cd "${0%/*}" && pwd)
 ERTS_BIN_DIR=$COUCHDB_BIN_DIR/../
-cd $COUCHDB_BIN_DIR/../
+cd "$COUCHDB_BIN_DIR/../"
 
 export ROOTDIR=${ERTS_BIN_DIR%/*}
 
-START_ERL=`cat $ROOTDIR/releases/start_erl.data`
+START_ERL=`cat "$ROOTDIR/releases/start_erl.data"`
 ERTS_VSN=${START_ERL% *}
 APP_VSN=${START_ERL#* }
 
-export BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
+export BINDIR="$ROOTDIR/erts-$ERTS_VSN/bin"
 export EMU=beam
 export PROGNAME=`echo $0 | sed 's/.*\///'`
 
-exec $BINDIR/erlexec -boot $ROOTDIR/releases/$APP_VSN/couchdb \
- -args_file $ROOTDIR/etc/vm.args \
- -config $ROOTDIR/releases/$APP_VSN/sys.config
+exec "$BINDIR/erlexec" -boot "$ROOTDIR/releases/$APP_VSN/couchdb" \
+ -args_file "$ROOTDIR/etc/vm.args" \
+ -config "$ROOTDIR/releases/$APP_VSN/sys.config"