Merge pull request #556 from callahm3/master
authorMorgan Haskel <morgan@puppetlabs.com>
Wed, 5 Aug 2015 20:19:17 +0000 (13:19 -0700)
committerMorgan Haskel <morgan@puppetlabs.com>
Wed, 5 Aug 2015 20:19:17 +0000 (13:19 -0700)
commit849d000ff335d460fbb11a4d4ee4a83affff729d
tree6ac1a770c058491fbfae8ad91a225ec8b8184c04
parentf05e43c28588a280a42333f9ca3a506a7121849d
parentafa4d45ee904092ef17f4cb1a6189817819adc67
Merge pull request #556 from callahm3/master

Proxy ensure parameter.