Skip to content
Browse files

Merge branch 'master' into hadoop_autotuner

* master:
  package set no likey chef 111
  undoing package_set change
  version bump
  fix for new-style set attributes in package_set
  fixed angry chef node.set
  • Loading branch information...
2 parents 1e9e3b6 + 89bba8a commit 8782cb7bf6f286773bcb0d5f22ab7dc5ff4b1036 Philip (flip) Kromer committed Mar 13, 2013
View
2 cookbooks/hbase/VERSION
@@ -1 +1 @@
-3.2.11
+3.2.12
View
2 cookbooks/hbase/recipes/default.rb
@@ -47,7 +47,7 @@
# JMX should listen on the public interface
# node[:hbase][:jmx_dash_addr] = public_ip_of(node)
-node[:hbase][:jmx_dash_addr] = node[:cloud].public_hostname
+node.set[:hbase][:jmx_dash_addr] = node[:cloud].public_hostname
# FIXME: don't hardcode these...
link("#{node[:hbase][:home_dir]}/hbase.jar" ){ to "hbase-0.90.4-cdh3u2.jar" }
View
2 cookbooks/package_set/VERSION
@@ -1 +1 @@
-3.2.8
+3.2.10
View
3 cookbooks/package_set/recipes/default.rb
@@ -19,7 +19,8 @@
# limitations under the License.
#
-node[:package_set][:install].map!(&:to_s)
+Chef::Log.info node[:package_set][:install]
+# node[:package_set][:install].map!(&:to_s)
node[:package_set][:pkgs].each do |set_name, pkgs|
next unless node[:package_set][:install].include?(set_name.to_s)

0 comments on commit 8782cb7

Please sign in to comment.
Something went wrong with that request. Please try again.