Diffusion puppet-puppetlabs-concat 89fceb4bc3d0

Merge pull request #354 from bmjen/merge-master
89fceb4bc3d0
Actions

Description

Merge pull request #354 from bmjen/merge-master

Merge master into 1.2.x

Details

Provenance

Morgan Haskel <morgan@puppetlabs.com>	Authored on Jul 21 2015, 12:32 AM
olasd	Pushed on Feb 26 2016, 9:36 AM

Parents

rSPCATd336ea0c58d7: Merge pull request #352 from mhaskel/pe_next_fixes
rSPCAT35958b3e6963: Merge pull request #339 from hunner/add_helper

Branches

Unknown

Tags

Unknown

Event Timeline

Morgan Haskel <morgan@puppetlabs.com> committed rSPCAT89fceb4bc3d0: Merge pull request #354 from bmjen/merge-master (authored by Morgan Haskel <morgan@puppetlabs.com>).Jul 21 2015, 12:32 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

d336ea0c58d7 Merge pull request #352 from mhaskel/pe_next_fixes
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
c129edffca64 Use AIO ruby if available
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
c47e72c5c4da Merge pull request #351 from hunner/mergeback
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
afe258a6b4d1 Merge remote-tracking branch 'puppetlabs/1.2.x'
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
848554e0f21f Merge pull request #350 from mhaskel/pe_next_fixes
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
408633fd9607 Missed a typo
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
e936813e0889 Merge pull request #348 from gwollman/bug/master/FreeBSD-ruby-interpreter
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
2f82480febfa Merge pull request #349 from mhaskel/pe_next_fixes
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
a72be83df351 Use the correct vardir in the tests
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
839de048afd4 (#2208) FreeBSD: call /usr/local/bin/ruby explicitly
Author
Garrett Wollman <wollman@csail.mit.edu>
Browse Repository
No Builds
No Audits
adb17a4bc835 Merge pull request #344 from drewfisher314/ticket/2135-add-solaris-12
Author
JT (Jonny) <jonathan.tripathy@puppetlabs.com>
Browse Repository
No Builds
No Audits
47359c3804a6 Merge pull request #347 from mhaskel/aio_fix
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
967880fc4a96 check for nil
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
b36f071d6558 Merge pull request #346 from mhaskel/aio_fix
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
f6545611739a Default test vardir to the aio paths for *nix systems
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
86180764b75d Merge pull request #345 from mhaskel/aio_helper
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
7473415ea362 Add helper to install puppet/pe/puppet-agent
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
588757dd24a5 Merge pull request #343 from raphink/fix/is_pe_master
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
5bc2d58394ae Add support for Solaris 12
Author
Drew Fisher <drew.fisher@oracle.com>
Browse Repository
No Builds
No Audits
17b836bb2121 Compare $::is_pe as bool, not string
Author
Raphaël Pinson <raphael.pinson@camptocamp.com>
Browse Repository
No Builds
No Audits
130a3345551c Merge pull request #340 from bmjen/╯°□°╯︵┻━┻
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
52cb97c0896b Update CHANGELOG with yanked 2.x releases
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
6ad7f74b28ea Update spec tests for rspec-puppet 2.0
Author
Colleen Murphy <colleen@puppetlabs.com>
Browse Repository
No Builds
No Audits
e71af8118d5e (╯°□°)╯︵┻━┻ the 2.0.x rewrite
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
b84f710cab24 Merge pull request #335 from justinstoller/maint/master/set-puppet-version
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
d39884e624aa (maint) allow setting PUPPET_VERSION in acceptance
Author
Justin Stoller <justin.stoller@gmail.com>
Browse Repository
No Builds
No Audits
171a304198f8 Merge pull request #334 from bmjen/fix-windows
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
0ea02e4c6c42 fixes special characters test to support windows file restrictions
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
375de4a1f854 Merge pull request #333 from puppetlabs/travisci_update
Author
TP Honey <tphoney@users.noreply.github.com>
Browse Repository
No Builds
No Audits
2059f817ac98 Updated travisci file to do testing for Puppet 4
Author
Jonathan Tripathy <jt@puppetlabs.com>
Browse Repository
No Builds
No Audits
4c13cb011492 Merge pull request #332 from bmjen/bug/safe-name-on-windows
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
4a7818854102 (MODULES-2094) Extend regexp to remove parenthesis on safe names
Author
Luis Fernandez Alvarez <luis.fernandez.alvarez@cern.ch>
Browse Repository
No Builds
No Audits
724dcaaeb046 Merge pull request #330 from duritong/fix_autorequire
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
09a380c92f12 (MODULES-2023) - autorequire the file we are generating
Author
mh <mh@immerda.ch>
Browse Repository
No Builds
No Audits
8d7d42788b5c Merge pull request #328 from puppetlabs/2.0.x-to-master
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
75d1e9625211 Merge pull request #325 from bmjen/2.0.1_prep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
d6ee5a8606d9 Release 2.0.1 prep
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
5267d3587c50 1.2.3 Release prep
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
186956397c45 Merge pull request #322 from DavidS/fixup-readme
Author
TP Honey <tphoney@users.noreply.github.com>
Browse Repository
No Builds
No Audits
f1b7a50f6830 Fixup the wording in README
Author
David Schmitt <david.schmitt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ddcf87fe103f Merge pull request #321 from bmjen/empty-concats
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
6264171b3351 Merge pull request #319 from bmjen/add-file-autorequire
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
64b9288ac77c fix defaulted force behavior
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
773b858771c0 Merge pull request #320 from DavidS/add-warn-warning
Author
TP Honey <tphoney@users.noreply.github.com>
Browse Repository
No Builds
No Audits
b271bff5059f (MODULES-2080) Call out changed behaviour of 'warn' parameter
Author
David Schmitt <david.schmitt@puppetlabs.com>
Browse Repository
No Builds
No Audits
78fdb4e794e0 adds file autorequire
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
e9ee044ef780 Merge pull request #318 from bmjen/frag-targeting
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
db3382992b29 fix fragment target handling
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
02c5f4b9f598 Merge pull request #317 from bmjen/tableflip
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
22927590249d fixes dependency bug in creating the target file
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

manifests/

spec/

acceptance/

concat_spec.rb

unit/

defines/

concat_fragment_spec.rb

concat_spec.rb

rSPCAT89fceb4bc3d0

View Options

.travis.yml

View Options

CHANGELOG.md

View Options

Gemfile

View Options

README.md

View Options

Rakefile

View Options

manifests/init.pp

View Options

manifests/setup.pp

View Options

metadata.json

View Options

spec/acceptance/concat_spec.rb

View Options

spec/unit/defines/concat_fragment_spec.rb

View Options

spec/unit/defines/concat_spec.rb

Merge pull request #354 from bmjen/merge-master89fceb4bc3d0Actions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rSPCAT89fceb4bc3d0

.travis.yml

CHANGELOG.md

Gemfile

README.md

Rakefile

manifests/init.pp

manifests/setup.pp

metadata.json

spec/acceptance/concat_spec.rb

spec/unit/defines/concat_fragment_spec.rb

spec/unit/defines/concat_spec.rb

Merge pull request #354 from bmjen/merge-master
89fceb4bc3d0
Actions