diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2013-05-07 12:10:06 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2013-05-07 12:10:06 -0700 |
commit | 226c191e275137e4f13092b001a691ee7b7936ba (patch) | |
tree | 74810d0b8dbd66294f279ea6adfdec49e42687c5 /spec/unit/puppet/parser/functions/parsejson_spec.rb | |
parent | 3e59bbd2dbaf2e40abc786411e3bf3998f6e715d (diff) | |
parent | 77ea8439fedcb82452a83af78c5378e4d1ee3c10 (diff) |
Merge branch 'fix_facts_dot_d_with_pe'
* fix_facts_dot_d_with_pe:
(maint) Indent facter_dot_d with 2 spaces
(#20582) Restore facter_dot_d to stdlib for PE users
Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
(maint) Update Gemfile with GEM_FACTER_VERSION
closes #153
Diffstat (limited to 'spec/unit/puppet/parser/functions/parsejson_spec.rb')
0 files changed, 0 insertions, 0 deletions