From: Mikhail Galanin <negram@users.noreply.github.com>
Date: Mon, 20 Aug 2018 09:28:35 +0000 (+0100)
Subject: Merge branch 'master' into lua-coroutine-model
X-Git-Tag: 1.8.0~234^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f9606fe254533f1cb493230b5ab4ee075cd550f6;p=rspamd.git

Merge branch 'master' into lua-coroutine-model
---

f9606fe254533f1cb493230b5ab4ee075cd550f6
diff --cc src/plugins/lua/multimap.lua
index 4514bc4f7,d20885525..909260681
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@@ -28,7 -28,7 +28,8 @@@ local regexp = require "rspamd_regexp
  local rspamd_expression = require "rspamd_expression"
  local rspamd_ip = require "rspamd_ip"
  local lua_util = require "lua_util"
 +local rspamd_dns = require "rspamd_dns"
+ local lua_selectors = require "lua_selectors"
  local redis_params
  local fun = require "fun"
  local N = 'multimap'