diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-01-18 09:07:13 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-01-18 09:09:35 -0800 |
| commit | 5976d21c1d68403301b6ca4345aca07071c63812 (patch) | |
| tree | 6c94e4c86276c998b68b8c352ca1be0b69f670a1 /spec/integration | |
| parent | ca084429991a141127c80e9d2a08cb1bb68585c4 (diff) | |
| download | chef-5976d21c1d68403301b6ca4345aca07071c63812.tar.gz | |
another chefstyle catchup + pull masterlcg/chefstyle-catchup2
bunch of merges over the weekend need re-fixing again.
seems like pointing at master of chefstyle is probably a good idea to
start making people fix their code before merging.
Diffstat (limited to 'spec/integration')
| -rw-r--r-- | spec/integration/knife/download_spec.rb | 4 | ||||
| -rw-r--r-- | spec/integration/knife/upload_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/integration/knife/download_spec.rb b/spec/integration/knife/download_spec.rb index 57229b915a..86f1d9f4a4 100644 --- a/spec/integration/knife/download_spec.rb +++ b/spec/integration/knife/download_spec.rb @@ -1186,7 +1186,7 @@ EOM policy_group "x", { "policies" => { "x" => { "revision_id" => "1.0.0" }, - "blah" => { "revision_id" => "1.0.0" } + "blah" => { "revision_id" => "1.0.0" }, } } role "x", {} @@ -1273,7 +1273,7 @@ EOM file "policy_groups/x.json", { "policies" => { "x" => { "revision_id" => "1.0.1" }, - "y" => { "revision_id" => "1.0.0" } + "y" => { "revision_id" => "1.0.0" }, } } file "roles/x.json", { "run_list" => [ "blah" ] } diff --git a/spec/integration/knife/upload_spec.rb b/spec/integration/knife/upload_spec.rb index 6ef40a1d98..afedf97459 100644 --- a/spec/integration/knife/upload_spec.rb +++ b/spec/integration/knife/upload_spec.rb @@ -1349,7 +1349,7 @@ EOM policy_group "x", { "policies" => { "x" => { "revision_id" => "1.0.0" }, - "blah" => { "revision_id" => "1.0.0" } + "blah" => { "revision_id" => "1.0.0" }, } } role "x", {} @@ -1403,7 +1403,7 @@ EOM policy_group "x", { "policies" => { "x" => { "revision_id" => "1.0.1" }, - "y" => { "revision_id" => "1.0.0" } + "y" => { "revision_id" => "1.0.0" }, } } role "x", { "run_list" => [ "blah" ] } |