diff options
| author | Daniel DeLeo <dan@opscode.com> | 2011-04-15 08:55:05 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2011-04-15 08:55:05 -0700 |
| commit | e2f21ea624ce3973a3c99dad52c1ed0ef7a0bca5 (patch) | |
| tree | 83b2184900791b4c0d8dcf8b9b77132d9ac8c343 | |
| parent | 005474d68a866fdc77bed2770cd9676c8c9c573b (diff) | |
| parent | a38c43f728bd16d1be27fe28d1afd232993b7af1 (diff) | |
| download | chef-e2f21ea624ce3973a3c99dad52c1ed0ef7a0bca5.tar.gz | |
Merge branch 'CHEF-2228'
| -rwxr-xr-x | chef-expander/bin/chef-expander | 5 | ||||
| -rwxr-xr-x | chef-expander/bin/chef-expander-vnode (renamed from chef-expander/bin/chef-expander-cluster) | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chef-expander/bin/chef-expander b/chef-expander/bin/chef-expander index 8d2cdbba02..789e6e81b8 100755 --- a/chef-expander/bin/chef-expander +++ b/chef-expander/bin/chef-expander @@ -19,12 +19,11 @@ # limitations under the License. # - require "rubygems" $:.unshift(File.dirname(__FILE__) + '/../lib/') require 'chef/expander' -require 'chef/expander/vnode_supervisor' +require 'chef/expander/cluster_supervisor' -Chef::Expander::VNodeSupervisor.start +Chef::Expander::ClusterSupervisor.new.start diff --git a/chef-expander/bin/chef-expander-cluster b/chef-expander/bin/chef-expander-vnode index 789e6e81b8..8d2cdbba02 100755 --- a/chef-expander/bin/chef-expander-cluster +++ b/chef-expander/bin/chef-expander-vnode @@ -19,11 +19,12 @@ # limitations under the License. # + require "rubygems" $:.unshift(File.dirname(__FILE__) + '/../lib/') require 'chef/expander' -require 'chef/expander/cluster_supervisor' +require 'chef/expander/vnode_supervisor' -Chef::Expander::ClusterSupervisor.new.start +Chef::Expander::VNodeSupervisor.start |