diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 11:42:03 +0100 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 11:42:03 +0100 |
| commit | 0f4f5d119c0deeee4806d33d688e735496a0e7ab (patch) | |
| tree | e8027168300e135534d32ac7ce365a8d4a938a54 /mason/mason.sh | |
| parent | 0f11a6cbe1f4a70279c06ecdacaea942db36c209 (diff) | |
| parent | 950017e5621bf5eac6ea13e9340194a6559b2bb1 (diff) | |
| download | definitions-0f4f5d119c0deeee4806d33d688e735496a0e7ab.tar.gz | |
Merge branch 'baserock/pedroalvarez/generic-mason3'
Reviewed-by: Richard Maw
Reviewed-by: Sam Thursfield
Diffstat (limited to 'mason/mason.sh')
| -rwxr-xr-x | mason/mason.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mason/mason.sh b/mason/mason.sh index 13ea21db..32aab032 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -4,7 +4,7 @@ set -e set -x # Load our deployment config -. /root/mason.conf +. /etc/mason.conf if [ ! -e ws ]; then morph init ws |