couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [2/3] git commit: updated refs/heads/master to 1c0fe36
Date Mon, 06 Jan 2014 23:55:16 GMT
Mention SOCKS5 protocol option in docs

COUCHDB-2025


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

Branch: refs/heads/master
Commit: 9dd093df4577a889cd6ef2bb8fb6dfdd2f0381cb
Parents: fcd76c9
Author: Robert Newson <rnewson@apache.org>
Authored: Mon Jan 6 23:27:33 2014 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Mon Jan 6 23:37:43 2014 +0000

----------------------------------------------------------------------
 share/doc/src/api/server/common.rst | 2 +-
 share/doc/src/whatsnew/1.6.rst      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9dd093df/share/doc/src/api/server/common.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/api/server/common.rst b/share/doc/src/api/server/common.rst
index 98bb19b..4e5614c 100644
--- a/share/doc/src/api/server/common.rst
+++ b/share/doc/src/api/server/common.rst
@@ -359,7 +359,7 @@ jumping to ``offset`` bytes towards the beginning of the file first:
     Required administrator's privileges on target server.
   :<json array doc_ids: Array of document IDs to be synchronized
   :<json string proxy: Address of a proxy server through which replication
-    should occur
+    should occur (protocol can be "http" or "socks5")
   :<json string source: Source database name or URL
   :<json string target: Target database name or URL
   :>header Content-Type: - :mimetype:`application/json`

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9dd093df/share/doc/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/whatsnew/1.6.rst b/share/doc/src/whatsnew/1.6.rst
index 2a0fc6e..28e5ac2 100644
--- a/share/doc/src/whatsnew/1.6.rst
+++ b/share/doc/src/whatsnew/1.6.rst
@@ -51,3 +51,4 @@ Version 1.6.0
 * :issue:`1962`: Various replicator enhancements
   :commit:`1d5fe2aa` write access for checkpoints is not required on source db
   :commit:`0693f98e` make the replication checkpoint interval configurable
+  :issue:`2025`: Support SOCKS5 protocol for replication sources and targets


Mime
View raw message