summaryrefslogtreecommitdiff
path: root/spec/acceptance/merge_spec.rb
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2014-11-10 11:43:00 -0800
committerMorgan Haskel <morgan@puppetlabs.com>2014-11-10 11:43:00 -0800
commit19f2dd359e98b3615f225daf1b28f70a31bd7487 (patch)
tree330ad28e96c04019eaa2f0c05732dcf0d2204b32 /spec/acceptance/merge_spec.rb
parent850297b560738ff385959a97a96c916105be5631 (diff)
parentcbc55084c8b5df507fe9ac5effe08d744355bb15 (diff)
downloadpuppet-stdlib-19f2dd359e98b3615f225daf1b28f70a31bd7487.tar.gz
puppet-stdlib-19f2dd359e98b3615f225daf1b28f70a31bd7487.tar.bz2
Merge pull request #355 from hunner/release_4.4.0
Release 4.4.0
Diffstat (limited to 'spec/acceptance/merge_spec.rb')
0 files changed, 0 insertions, 0 deletions