Merge remote-tracking branch 'upstream/master' into install-auto-detect-distro-init

This commit is contained in:
Bill Burton 2017-04-28 11:38:12 -04:00
commit 320856516f
1 changed files with 2 additions and 2 deletions

View File

@ -421,8 +421,8 @@ if s3_enable == true then
end
server.register(namespace=!s3_namespace, "connected", fun (s) -> begin log("#{!s3_namespace}.connected") !s3_connected end)
output_to(s3_output, s3_type, s3_bitrate, s3_host, s3_port, s3_pass,
s3_mount, s3_url, s3_name, s3_genre, s3_user, s, "3",
s3_connected, s3_description, s3_channels)
s3_mount, s3_url, s3_description, s3_genre, s3_user, s, "3",
s3_connected, s3_name, s3_channels)
end
s4_namespace = ref ''