summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <mcquin@users.noreply.github.com>2014-06-09 15:57:13 -0700
committerClaire McQuin <mcquin@users.noreply.github.com>2014-06-09 15:57:13 -0700
commit1dfc84ef23ffc9d610be4f88a0f83fe890aa82a2 (patch)
tree7b1ff7055d0bc5aa04ef84568f59c72d2276ad95
parentc208ccbfe02cf0ef6f972d6a371cf37f1aeb22e8 (diff)
parent6b2b1619596d32102a2548ba911a95cb98d2a866 (diff)
downloadchef-1dfc84ef23ffc9d610be4f88a0f83fe890aa82a2.tar.gz
Merge pull request #1412 from jtimberman/jtimberman/CHEF-5276
CHEF-5276, use upstart on ubuntu 13.10+
-rw-r--r--lib/chef/platform/provider_mapping.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb
index a4b19192ff..c08a7e8b44 100644
--- a/lib/chef/platform/provider_mapping.rb
+++ b/lib/chef/platform/provider_mapping.rb
@@ -71,6 +71,9 @@ class Chef
},
">= 11.10" => {
:ifconfig => Chef::Provider::Ifconfig::Debian
+ },
+ ">= 13.10" => {
+ :service => Chef::Provider::Service::Upstart,
}
},
:gcel => {