Merge branch '0.4.x'

Conflicts: CHANGELOG Modulefile
voxpupuli · Aug 18, 2013 · 06930c3 · 06930c3
2 parents c7c2fce + d7b26d2
commit 06930c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,5 @@
 CHANGELOG
+=========
 
 0.5.0
 -----
@@ -18,6 +19,15 @@ This is a backwards compatible feature and bugfix release
 Thanks to Eric Sakowski, Wolf Noble, Vlastimil Holer, and Dan Fruehauf for
 their contributions to this release.
 
+0.4.1
+-----
+
+2013-08-17
+
+This is a backwards compatible bugfix release
+
+  * Update Modulefile dependency for adrien/boolean to >= 1.0.0
+
 0.4.0
 -----
 

diff --git a/Modulefile b/Modulefile
@@ -11,5 +11,5 @@ project_page 'https://github.com/adrienthebo/puppet-network'
 
 dependency 'puppetlabs/stdlib', '>= 2.3.0'
 dependency 'adrien/filemapper', '>= 1.0.0'
-dependency 'adrien/boolean',    '0.9.x'
+dependency 'adrien/boolean', '>= 1.0.0'
 dependency 'camptocamp/kmod',   '0.0.x'
diff --git a/...k_config/redhat_spec/virbonding/vlan100:0 → ...k_config/redhat_spec/virbonding/vlan100_0 b/...k_config/redhat_spec/virbonding/vlan100:0 → ...k_config/redhat_spec/virbonding/vlan100_0