Merge branch 'oal/apdex' of https://github.com/apache/skywalking into…

… oal/apdex
apache · Nov 27, 2019 · 542a227 · 542a227
2 parents 5ac71ce + 260027f
commit 542a227
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -62,6 +62,7 @@ Release Notes.
 - BugFix: endpoint grouping rules may be not unique (#3510)
 - Add feature to control the maximum agent log files (#3475)
 - Agent support custom properties. (#3367)
+- Add Light4j plugin (#3323)
 
 #### Document
 - Remove travis badge (#3763)

diff --git a/skywalking-ui b/skywalking-ui
diff --git a/test/plugin/runner-helper/src/main/resources/docker-compose.template b/test/plugin/runner-helper/src/main/resources/docker-compose.template
@@ -38,7 +38,9 @@ services:
             - ${env}
         </#list>
         </#if>
+        <#if start_script??>
             - SCENARIO_START_SCRIPT=${start_script}
+        </#if>
             - SCENARIO_NAME=${scenario_name}
             - SCENARIO_VERSION=${scenario_version}
             - SCENARIO_ENTRY_SERVICE=${entry_service}