summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Doherty <cdoherty@chef.io>2015-11-13 10:38:29 -0800
committerChris Doherty <cdoherty@chef.io>2015-11-13 10:38:29 -0800
commitbc1921cb2ba1d68456e410f8838609b14c05973d (patch)
treead57f4caa8ce894998dcc635c48d2df11531af86
parent2e8d5e7ac657faa49e439931db8436a69b7e88ab (diff)
downloadchef-zero-bc1921cb2ba1d68456e410f8838609b14c05973d.tar.gz
Bug-for-bug compatibility with Server, where pedant expects an "actors" list of ["pivotal", "pivotal"], but chef-zero has been returning ["pivotal"].
-rw-r--r--lib/chef_zero/chef_data/default_creator.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb
index d1a0118..8a5b7fb 100644
--- a/lib/chef_zero/chef_data/default_creator.rb
+++ b/lib/chef_zero/chef_data/default_creator.rb
@@ -378,11 +378,12 @@ module ChefZero
# Non-default containers do not get superusers added to them,
# because reasons.
unless path.size == 4 && path[0] == 'organizations' && path[2] == 'containers' && !exists?(path)
- owners |= superusers
+ owners += superusers
end
end
- owners.uniq
+ # we don't de-dup this list, because pedant expects to see ["pivotal", "pivotal"] in some cases.
+ owners
end
def default_acl(acl_path, acl={})