Diffusion puppet-puppetlabs-concat c47e72c5c4da

Merge pull request #351 from hunner/mergeback
c47e72c5c4daUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #351 from hunner/mergeback

Mergeback 1.2.x to master

Details

Provenance

Bryan Jen <bryan.jen@gmail.com>	Authored on
olasd	Pushed on Sep 10 2015, 1:22 PM

Parents

rSPCATafe258a6b4d1: Merge remote-tracking branch 'puppetlabs/1.2.x'
rSPCAT848554e0f21f: Merge pull request #350 from mhaskel/pe_next_fixes

Branches

Unknown

Tags

Unknown

Event Timeline

Bryan Jen <bryan.jen@gmail.com> committed rSPCATc47e72c5c4da: Merge pull request #351 from hunner/mergeback (authored by Bryan Jen <bryan.jen@gmail.com>).Jul 15 2015, 11:50 PM

Merged Changes

afe258a6b4d1 Merge remote-tracking branch 'puppetlabs/1.2.x'
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
35958b3e6963 Merge pull request #339 from hunner/add_helper
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
9dd00aab2de3 Add helper to install puppet/pe/puppet-agent
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
5997e65f18eb Merge pull request #326 from bmjen/refix-lint
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
a5cce42a5ba2 fixes bug introduced by a linting fix
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
6cecf8c88bb7 Merge pull request #324 from bmjen/1.2.3_prep
Author
Hunter Haugen <hunter@puppetlabs.com>
Browse Repository
No Builds
No Audits
6751adb2826a 1.2.3 Release prep
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
b0c874be61c2 Merge pull request #323 from bmjen/update-readme
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
d4376cb3f5d9 updates init.pp to pass linting
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
abf40f0485e2 update README with correct behavior for fragment parameter
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
2d5734c29769 Merge pull request #312 from bmjen/1.2.2-prep
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
b5f17644b5a0 update metadata.json
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
4ea84be7d702 Merge pull request #311 from bmjen/1.2.2-prep
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
8d0442672fd6 1.2.2 release prep
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
253f4975c72a Merge pull request #303 from bmjen/modules-1933
Author
Colleen Murphy <cmurphy@users.noreply.github.com>
Browse Repository
No Builds
No Audits
0459ebace521 MODULES-1933: fixes backup passing in fragments without concat resource
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits
ececd065ce09 Merge pull request #292 from bmjen/release-prep-1.2.1
Author
Morgan Haskel <morgan@puppetlabs.com>
Browse Repository
No Builds
No Audits
8198296c7b15 Updates CHANGELOG and metadata for 1.2.1 release
Author
Bryan Jen <bryan.jen@gmail.com>
Browse Repository
No Builds
No Audits

Changes (1)

Path

Size

CHANGELOG.md

rSPCATc47e72c5c4da

View Options

Merge pull request #351 from hunner/mergebackc47e72c5c4daUnpublishedActions