summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-01-30 08:25:55 -0800
committerGitHub <noreply@github.com>2020-01-30 08:25:55 -0800
commitc383b2b7014fdc1bbe7272a512b8d037385ab445 (patch)
treeba4f456df259401eb4f9d34929159d67c96ed9bd
parent5e2591bdc738b99a8bf3776bf40f876f51e80c66 (diff)
parent03555ba9ff00d0ff80d3589e41e0d4cd5ac0f33f (diff)
downloadchef-c383b2b7014fdc1bbe7272a512b8d037385ab445.tar.gz
Merge pull request #9300 from cinc-project/fix_dist_chef_zero
revert to "chef"
-rw-r--r--chef-config/lib/chef-config/config.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index a0fc8d5bd2..eb65eb1cc6 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -464,7 +464,7 @@ module ChefConfig
# When set to a String, Chef Zero disables multitenant support. This is
# what you want when using Chef Zero to serve a single Chef Repo. Setting
# this to `false` enables multi-tenant.
- default :single_org, ChefConfig::Dist::SHORT
+ default :single_org, "chef"
# Whether Chef Zero should operate in a mode analogous to OSS Chef Server
# 11 (true) or Chef Server 12 (false). Chef Zero can still serve