From 2dc5ffcedf030f09a5312c682608ba762958f986 Mon Sep 17 00:00:00 2001 From: jloh Date: Sun, 23 Dec 2018 18:40:12 +1100 Subject: [PATCH 1/3] Expose tbl_copy globally --- lib/geojs/utils.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/geojs/utils.lua b/lib/geojs/utils.lua index 83284ac..5724387 100644 --- a/lib/geojs/utils.lua +++ b/lib/geojs/utils.lua @@ -361,6 +361,7 @@ local function tbl_copy_merge_defaults(t1, defaults) return t1 -- not a table end end +_M.tbl_copy_merge_defaults = tbl_copy_merge_defaults -- Splits strings! From 471b6ec2f4b5dd0145bd3318dd4904b6572149cc Mon Sep 17 00:00:00 2001 From: jloh Date: Sun, 23 Dec 2018 18:42:15 +1100 Subject: [PATCH 2/3] Bump deps --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e627032..8bc2595 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: openresty/lua-resty-upload=0.10 \ bungle/lua-resty-reqargs=1.4 \ xiaooloong/lua-resty-iconv=0.2.0 \ - anjia0532/lua-resty-maxminddb=0.06 + anjia0532/lua-resty-maxminddb=v1.3.0 - run: name: 'Add in Maxmind ASN' command: | From 6d6eebfd1aefa59d9384b76c696d839507c05ff8 Mon Sep 17 00:00:00 2001 From: jloh Date: Sun, 23 Dec 2018 18:47:53 +1100 Subject: [PATCH 3/3] Bump deps --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8bc2595..f69a240 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: openresty/lua-resty-upload=0.10 \ bungle/lua-resty-reqargs=1.4 \ xiaooloong/lua-resty-iconv=0.2.0 \ - anjia0532/lua-resty-maxminddb=v1.3.0 + anjia0532/lua-resty-maxminddb=1.3.0 - run: name: 'Add in Maxmind ASN' command: |