Commit f39a3f96 authored by Phillip Webb's avatar Phillip Webb

Merge branch '2.1.x' into 2.2.x

parents 9aa8a073 7e64f970
...@@ -7,7 +7,7 @@ anchors: ...@@ -7,7 +7,7 @@ anchors:
docker-resource-source: &docker-resource-source docker-resource-source: &docker-resource-source
username: ((docker-hub-username)) username: ((docker-hub-username))
password: ((docker-hub-password)) password: ((docker-hub-password))
tag: ((branch)) tag: ((milestone))
build-project-task-params: &build-project-task-params build-project-task-params: &build-project-task-params
privileged: true privileged: true
timeout: ((task-timeout)) timeout: ((task-timeout))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment