Merge branch 'trim-module-data-hierarchy' into 6.0-prerelease

2016-04-20 11:37:39 -05:00 · 2016-04-20 11:37:39 -05:00 · 0f4f548a72
commit 0f4f548a72
parent 05f990bcc9 c0f47735ea
1 changed files with 0 additions and 2 deletions
--- a/data/hiera.yaml
+++ b/data/hiera.yaml
@ -1,6 +1,4 @@
 # ex: si ts=2 sw=2 et
 :hierarchy:
-  - osfamily/%{::osfamily}/%{::operatingsystem}/%{lsbdistrelease}
-  - osfamily/%{::osfamily}/%{::operatingsystem}
  - osfamily/%{::osfamily}
  - common