You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/09/28 16:49:38 UTC

[09/39] couchdb commit: updated refs/heads/developer-preview-2.0 to 3ac3db6

Fix compatibility with Python 3.x


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

Branch: refs/heads/developer-preview-2.0
Commit: eb3451332e549c2ec30a8f9121130e623d4f9a6c
Parents: 587646f
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Aug 17 16:17:02 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Aug 17 16:17:02 2015 +0300

----------------------------------------------------------------------
 dev/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/eb345133/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 81993b5..dc9785a 100755
--- a/dev/run
+++ b/dev/run
@@ -203,7 +203,7 @@ def find_haproxy():
     )
     (res, _) = p.communicate()
     if res.strip():
-        return res.strip()
+        return res.strip().decode()
     return "/usr/sbin/haproxy"