Merge pull request #455 from cmurphy/fix_tests
authorMorgan Haskel <morgan@puppetlabs.com>
Tue, 30 Dec 2014 20:57:55 +0000 (12:57 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Tue, 30 Dec 2014 20:57:55 +0000 (12:57 -0800)
Fix puppet resource acceptance tests


Trivial merge