summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--lib/puppet/provider/zone/solaris.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ec6c37da7..d75b5bf85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.24.x
+ Fixed #1695 - Solaris 10 zone provider doesn't properly handle unknown zone attributes in newer releases
+
Fixed #1776 - Trivial fix for gentoo service provider
Added Rake :ci namespace and CI tasks
diff --git a/lib/puppet/provider/zone/solaris.rb b/lib/puppet/provider/zone/solaris.rb
index be2dd97f9..24bbb99ec 100644
--- a/lib/puppet/provider/zone/solaris.rb
+++ b/lib/puppet/provider/zone/solaris.rb
@@ -12,6 +12,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
properties = {}
line.split(":").each_with_index { |value, index|
+ next unless fields[index]
properties[fields[index]] = value
}