summaryrefslogtreecommitdiffstats
path: root/jjb/policy/include-raw-docker-merge.sh
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2017-05-22 16:51:44 +0000
committerGerrit Code Review <gerrit@onap.org>2017-05-22 16:51:44 +0000
commit3c277c4e80d978da8e235bbdb1bdb91a0a160178 (patch)
treeea0d8ffa3d20764ef4ad55ec3c1972140c262275 /jjb/policy/include-raw-docker-merge.sh
parent591164a1c3f0de2a3188463f2da680dee021f203 (diff)
parente55b622305e12f9965f2a1d73e67aa22f0e815e0 (diff)
Merge changes from topic 'coala'
* changes: Initial coala delint (global templates) Initial coala delint (ecompsdkos) Initial coala delint (ui) Initial coala delint (scripts) Initial coala delint (packer) Initial coala delint (portal) Initial coala delint (policy) Add configuration in prep to enable coala and tox
Diffstat (limited to 'jjb/policy/include-raw-docker-merge.sh')
-rw-r--r--jjb/policy/include-raw-docker-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/policy/include-raw-docker-merge.sh b/jjb/policy/include-raw-docker-merge.sh
index 998a93d26..abb38abe1 100644
--- a/jjb/policy/include-raw-docker-merge.sh
+++ b/jjb/policy/include-raw-docker-merge.sh
@@ -7,4 +7,4 @@ echo $CURRENTDIR
chmod 755 *.*
-./docker_merge.sh \ No newline at end of file
+./docker_merge.sh