Merge pull request #37 from jloh/lib_update

Update lua-resty-maxminddb
jloh · Dec 23, 2018 · 1fadb25 · 1fadb25
2 parents ca129cf + 6d6eebf
commit 1fadb25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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=1.3.0
       - run:
           name: 'Add in Maxmind ASN'
           command: |

diff --git 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!
-Original file line number
+Diff line change
@@ Expand Up / @@ -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!
@@ Expand Down @@