Diffusion puppet-puppetlabs-concat c5f2f4772f0c

Merge pull request #224 from puppetlabs/1.1.x
c5f2f4772f0cUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #224 from puppetlabs/1.1.x

1.1.x

Details

Provenance

Morgan Haskel <morgan@puppetlabs.com>	Authored on
olasd	Pushed on Sep 10 2015, 1:22 PM

Parents

rSPCATee552804c225: Merge pull request #223 from mhaskel/test_merge
rSPCAT8c7fe1b076e3: Merge pull request #217 from mhaskel/more_test_failures

Branches

Unknown

Tags

Unknown

Event Timeline

Morgan Haskel <morgan@puppetlabs.com> committed rSPCATc5f2f4772f0c: Merge pull request #224 from puppetlabs/1.1.x (authored by Morgan Haskel <morgan@puppetlabs.com>).Sep 11 2014, 1:29 AM

Merged Changes

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

ee552804c225 Merge pull request #223 from mhaskel/test_merge
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
f81ef495e3fb Fixing up tests
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
5f17a26256f7 Merge branch '1.0.x' into test_merge
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
6a1f3aaf94b5 Merge pull request #221 from mhaskel/no_more_unsupported
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
a6590ba98d63 There are no UNSUPPORTED_PLATFORMS defined for 1.1
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
5c56ec134fa8 Merge pull request #220 from mhaskel/test_updates_from_1.0.x
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
98d70da9fdb5 'wheel' is the root group for osx.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
7232b8f6840f Merge pull request #219 from mhaskel/1.1.1-prep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
77d6502a2d04 1.1.1 prep
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
cf366e26a872 Merge pull request #196 from mhaskel/prep-1.0.4
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
070f184ce333 Prep for 1.0.4 release.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
7cd6cf941147 Merge pull request #193 from mhaskel/osx-test-fixes
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
90f70e86a329 'wheel' is the root group for osx.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
c7461c5beb95 Merge pull request #192 from mhaskel/beaker-rspec-fix
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
d25226e36ac2 Try to force it to use the correct version of beaker-rspec.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
fb3c4affadb5 Merge pull request #191 from apenney/pin-rspec
Author
Travis Fields <cyberious@users.noreply.github.com>
Browse Repository
No Builds
No Audits
c0a918e4f31d Pin rspec to 2.x.
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
dbfe7a32dd4f Merge pull request #189 from apenney/103-release
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
13ae29d24bad Update for the 1.0.3 release being unsupported.
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
3465fe703e67 Merge pull request #188 from apenney/fix-tests
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
f66ca3c1b7d6 Remove all the eq() checks as this breaks in PE3.3.
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
03cee3f116a1 Merge pull request #184 from mhaskel/1.0.3-prep
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
379e273e2e9b Update PE version requirement.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
805ea0870de4 Merge pull request #182 from mhaskel/1.0.3-prep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
43a0313ba97a Update version in metadata.json.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
8f5c30c6a318 Claim PE3.3 support.
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
c4695b6d5f86 Merge pull request #180 from mhaskel/1.0.3-prep
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
fc56fe3d7c3d Update changelog, modulefile and metadata.json for supported 1.0.3 release.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
18f42ad8de73 Merge pull request #178 from mhaskel/ubuntu-test-fixes
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
33b90b4fbc16 Fixes to get tests running on trusty.
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
98f4dc50873d Merge pull request #168 from apenney/last-minute-metadata-fix
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
b4ba7dde5012 Add in missing files to work around Puppet bug.
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
34be315517dc Merge pull request #167 from apenney/supported-101
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
62913f72f590 Prepare supported module 1.0.2.
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
8d389084728a Merge pull request #164 from apenney/add-metadata
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
9afd286219d0 Prepare for supported modules.
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
8a689f135ca3 Merge pull request #165 from laurenrother/1.0.x
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
68a54e45ab48 Adds "Release Notes/Known Bugs" to Changelog,updates file format to markdown…
Author
Lauren Rother <lauren.rother@puppetlabs.com>
Browse Repository
No Builds
No Audits
40e80e5379c3 Merge pull request #163 from hunner/add_unsup
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
1577ec78e1a0 Add windows as unsupported
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
6929c709f999 Merge pull request #162 from hunner/fix_syntax
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
495619794e31 Correct the incorrect quotes
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
6c50f50aa020 Merge pull request #161 from hunner/fix_lets
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
d887c3b5f546 Lets can't be used outside of a test context
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
9c736f5699a6 Merge pull request #160 from hunner/use_tmpfile
Author
Ashley Penney <ashley.penney@puppetlabs.com>
Browse Repository
No Builds
No Audits
f0b6187f76d6 Use tmpdir instead of /tmp for windows compatability
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
1c10eb56144b Merge pull request #159 from hunner/grep_sol
Author
Branan Purvine-Riley <branan@puppetlabs.com>
Browse Repository
No Builds
No Audits
311adee522b2 It is actually all Solaris
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
660cf98c52c6 Merge pull request #158 from hunner/fix_sol10_grep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
f37805060f22 Correct syntax
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

CHANGELOG

	CHANGELOG.md
	CHANGELOG

metadata.json

spec/

acceptance/

backup_spec.rb

concat_spec.rb

empty_spec.rb

fragment_source_spec.rb

nodesets/

ubuntu-server-10044-x64.yml

ubuntu-server-12042-x64.yml

order_spec.rb

replace_spec.rb

symbolic_name_spec.rb

warn_spec.rb

rSPCATc5f2f4772f0c

View Options

CHANGELOG

View Options

CHANGELOG.md

View Options

metadata.json

View Options

spec/acceptance/backup_spec.rb

View Options

spec/acceptance/concat_spec.rb

View Options

spec/acceptance/empty_spec.rb

View Options

spec/acceptance/fragment_source_spec.rb

View Options

spec/acceptance/newline_spec.rb

View Options

spec/acceptance/nodesets/centos-64-x64.yml

View Options

spec/acceptance/nodesets/default.yml

View Options

spec/acceptance/nodesets/fedora-18-x64.yml

View Options

spec/acceptance/nodesets/ubuntu-server-10044-x64.yml

View Options

spec/acceptance/nodesets/ubuntu-server-12042-x64.yml

View Options

spec/acceptance/order_spec.rb

View Options

spec/acceptance/replace_spec.rb

View Options

spec/acceptance/symbolic_name_spec.rb

View Options

spec/acceptance/warn_spec.rb

Merge pull request #224 from puppetlabs/1.1.xc5f2f4772f0cUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (17)

rSPCATc5f2f4772f0c

CHANGELOG

CHANGELOG.md

metadata.json

spec/acceptance/backup_spec.rb

spec/acceptance/concat_spec.rb

spec/acceptance/empty_spec.rb

spec/acceptance/fragment_source_spec.rb

spec/acceptance/newline_spec.rb

spec/acceptance/nodesets/centos-64-x64.yml

spec/acceptance/nodesets/default.yml

spec/acceptance/nodesets/fedora-18-x64.yml

spec/acceptance/nodesets/ubuntu-server-10044-x64.yml

spec/acceptance/nodesets/ubuntu-server-12042-x64.yml

spec/acceptance/order_spec.rb

spec/acceptance/replace_spec.rb

spec/acceptance/symbolic_name_spec.rb

spec/acceptance/warn_spec.rb

Merge pull request #224 from puppetlabs/1.1.x
c5f2f4772f0cUnpublished
Actions