Merge branch 'develop' into release-1.1.0

dougalb · dougalb · commit f45ac507b20b · 2016-02-19T12:50:19.000-08:00
diff --git a/cloudformation/cfncluster.cfn.json b/cloudformation/cfncluster.cfn.json
@@ -1975,7 +1975,7 @@
                 "command" : "touch /etc/chef/ohai/hints/ec2.json"
               },
               "jq" : {
-                "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json"
+                "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || ( echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json )"
               }
             }
           },
@@ -2644,7 +2644,7 @@
                 "command" : "touch /etc/chef/ohai/hints/ec2.json"
               },
               "jq" : {
-                "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json"
+                "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || ( echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json )"
               }
             }
           },

Original file line number	Diff line number	Diff line change
`@@ -1975,7 +1975,7 @@`
`1975`	`1975`	`"command" : "touch /etc/chef/ohai/hints/ec2.json"`
`1976`	`1976`	`},`
`1977`	`1977`	`"jq" : {`
`1978`		`- "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 \| .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json \|\| echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json"`
	`1978`	`+ "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 \| .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json \|\| ( echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json )"`
`1979`	`1979`	`}`
`1980`	`1980`	`}`
`1981`	`1981`	`},`
`@@ -2644,7 +2644,7 @@`
`2644`	`2644`	`"command" : "touch /etc/chef/ohai/hints/ec2.json"`
`2645`	`2645`	`},`
`2646`	`2646`	`"jq" : {`
`2647`		`- "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 \| .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json \|\| echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json"`
	`2647`	`+ "command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 \| .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json \|\| ( echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json )"`
`2648`	`2648`	`}`
`2649`	`2649`	`}`
`2650`	`2650`	`},`