You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by me...@apache.org on 2019/12/19 08:50:06 UTC
[incubator-apisix] branch master updated: change: upgrade etcd to
version 0.8 and modify the connection keys. (#980)
This is an automated email from the ASF dual-hosted git repository.
membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push:
new bb04914 change: upgrade etcd to version 0.8 and modify the connection keys. (#980)
bb04914 is described below
commit bb0491453cd4671bb0e6113e3a7cc5db1cad5c76
Author: Janko <sh...@gmail.com>
AuthorDate: Thu Dec 19 16:49:55 2019 +0800
change: upgrade etcd to version 0.8 and modify the connection keys. (#980)
---
lua/apisix/core/config_etcd.lua | 2 ++
lua/apisix/core/etcd.lua | 2 ++
rockspec/apisix-master-0.rockspec | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lua/apisix/core/config_etcd.lua b/lua/apisix/core/config_etcd.lua
index 26e4c73..484e6ef 100644
--- a/lua/apisix/core/config_etcd.lua
+++ b/lua/apisix/core/config_etcd.lua
@@ -380,6 +380,8 @@ function _M.new(key, opts)
local etcd_conf = clone_tab(local_conf.etcd)
local prefix = etcd_conf.prefix
+ etcd_conf.http_host = etcd_conf.host
+ etcd_conf.host = nil
etcd_conf.prefix = nil
local etcd_cli
diff --git a/lua/apisix/core/etcd.lua b/lua/apisix/core/etcd.lua
index 3e34144..818c99b 100644
--- a/lua/apisix/core/etcd.lua
+++ b/lua/apisix/core/etcd.lua
@@ -29,6 +29,8 @@ local function new()
local etcd_conf = clone_tab(local_conf.etcd)
local prefix = etcd_conf.prefix
+ etcd_conf.http_host = etcd_conf.host
+ etcd_conf.host = nil
etcd_conf.prefix = nil
local etcd_cli
diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
index 1298a3d..27cb11b 100644
--- a/rockspec/apisix-master-0.rockspec
+++ b/rockspec/apisix-master-0.rockspec
@@ -31,7 +31,7 @@ description = {
dependencies = {
"lua-resty-template = 1.9",
- "lua-resty-etcd = 0.7",
+ "lua-resty-etcd = 0.8",
"lua-resty-balancer = 0.02rc5",
"lua-resty-ngxvar = 0.4",
"lua-resty-jit-uuid = 0.0.7",