Merge "CI: Fix actionlint to wait for the prepare step"
diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md
index c81c5f0..464d77b 100644
--- a/Sandbox_Setup.md
+++ b/Sandbox_Setup.md
@@ -69,7 +69,7 @@
### Make a copy of the example JJB config file (in the ci-management/ directory)
-Place a copy of the `jenkins.ini.example` file as `jenkins.ini` in your home folder:
+Place a copy of the `jenkins.ini.example` file as `jenkins.ini` in your home folder:
```sh
mkdir -p ~/.config/jenkins_jobs
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 82b317a..068ff12 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -85,7 +85,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: multicloud/framework
- project-name: 'multicloud-framework-multivimbroker'
+ project-name: 'multicloud-framework-multivimbroker'
stream:
- 'master':
branch: 'master'
diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
index ab49147..314c2c4 100644
--- a/jjb/music/music-distributed-kv-store-csit.yaml
+++ b/jjb/music/music-distributed-kv-store-csit.yaml
@@ -1,10 +1,10 @@
-# Integration templates no longer support these
+# Integration templates no longer support these
# job definitions; if Music CSIT needs to be restored,
# '{project-name}-review-verification-golang-{stream}'
# '{project-name}-merge-verification-golag-{stream}'
-# would have to be added to integration templates and
+# would have to be added to integration templates and
# applied here
-#
+#
#---
#- project:
# name: music-distributed-kv-store-csit
diff --git a/jjb/vfc/build-gvnfm-driver-docker-image.sh b/jjb/vfc/build-gvnfm-driver-docker-image.sh
index 3d2ff81..7948e7c 100755
--- a/jjb/vfc/build-gvnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-gvnfm-driver-docker-image.sh
@@ -8,7 +8,7 @@
chmod 755 ./gvnfmadapter/docker/*.*
./gvnfmadapter/docker/build_image.sh
-# juju-vnfmadapter is removed
+# juju-vnfmadapter is removed
# chmod 755 ./juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/*.*
# ./juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh