diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
| commit | 125dc63f565a46aedcb1750c45dcc97c71c2c72b (patch) | |
| tree | 15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /core/portmanager.lua | |
| parent | 83049e63c621c66da5129449f3a610df2e74ce38 (diff) | |
| parent | ec83b2aa91ab9142ad6e7f4d26b0f6d20853e747 (diff) | |
| download | prosody-125dc63f565a46aedcb1750c45dcc97c71c2c72b.tar.gz prosody-125dc63f565a46aedcb1750c45dcc97c71c2c72b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/portmanager.lua')
| -rw-r--r-- | core/portmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index eab2412a..bbb7c215 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -41,7 +41,7 @@ local active_services = multitable.new(); --- Private helpers -local function error_to_friendly_message(service_name, port, err) +local function error_to_friendly_message(service_name, port, err) --luacheck: ignore 212/service_name local friendly_message = err; if err:match(" in use") then -- FIXME: Use service_name here |