Diffusion puppet dd917cca29d6

Merge remote-tracking branch 'upstream/stable'
dd917cca29d6Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

upstream/stable: (maint) Don't test agent on the master for Win/Sol

Conflicts:
acceptance/config/nodes/solaris10.yaml
acceptance/config/nodes/solaris11.yaml
acceptance/config/nodes/win2003r2x64-rubyx64.yaml
acceptance/config/nodes/win2003r2x64-rubyx86.yaml
acceptance/config/nodes/win2003r2x86-rubyx86.yaml
acceptance/config/nodes/win2003x64-rubyx64.yaml
acceptance/config/nodes/win2003x64-rubyx86.yaml
acceptance/config/nodes/win2003x86-rubyx86.yaml
acceptance/config/nodes/win2008-rubyx64.yaml
acceptance/config/nodes/win2008-rubyx86.yaml
acceptance/config/nodes/win2008r2-rubyx64.yaml
acceptance/config/nodes/win2008r2-rubyx86.yaml
acceptance/config/nodes/win2012-rubyx64.yaml
acceptance/config/nodes/win2012-rubyx86.yaml
acceptance/config/nodes/win2012r2-rubyx64.yaml
acceptance/config/nodes/win2012r2-rubyx86.yaml

Details

Provenance

Josh Cooper <josh@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUd67eb9c75dda: Merge pull request #3413 from rji/maint/stable/remove-agent-role-from-master…
rPU9129051acb1b: Merge pull request #3414 from hkenney/issue/master/PUP-659_optimize-qualified…

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPUdd917cca29d6: Merge remote-tracking branch 'upstream/stable' (authored by Josh Cooper <josh@puppetlabs.com>).Dec 15 2014, 10:42 PM

Merged Changes

d67eb9c75dda Merge pull request #3413 from rji/maint/stable/remove-agent-role-from-master…
Author
Josh Cooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
cc8f73675683 (maint) Don't test agent on the master for Win/Sol
Author
Roger Ignazio <roger@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (16)

Path

Size

acceptance/

config/

nodes/

win2003r2x64-rubyx64.yaml

win2003r2x64-rubyx86.yaml

win2003r2x86-rubyx86.yaml

win2003x64-rubyx64.yaml

win2003x64-rubyx86.yaml

win2003x86-rubyx86.yaml

win2008-rubyx64.yaml

win2008-rubyx86.yaml

win2008r2-rubyx64.yaml

win2008r2-rubyx86.yaml

win2012-rubyx64.yaml

win2012-rubyx86.yaml

win2012r2-rubyx64.yaml

win2012r2-rubyx86.yaml

rPUdd917cca29d6

acceptance/config/nodes/solaris10.yaml

Loading...

acceptance/config/nodes/solaris11.yaml

Loading...

acceptance/config/nodes/win2003r2x64-rubyx64.yaml

Loading...

acceptance/config/nodes/win2003r2x64-rubyx86.yaml

Loading...

acceptance/config/nodes/win2003r2x86-rubyx86.yaml

Loading...

acceptance/config/nodes/win2003x64-rubyx64.yaml

Loading...

acceptance/config/nodes/win2003x64-rubyx86.yaml

Loading...

acceptance/config/nodes/win2003x86-rubyx86.yaml

Loading...

acceptance/config/nodes/win2008-rubyx64.yaml

Loading...

acceptance/config/nodes/win2008-rubyx86.yaml

Loading...

acceptance/config/nodes/win2008r2-rubyx64.yaml

Loading...

acceptance/config/nodes/win2008r2-rubyx86.yaml

Loading...

acceptance/config/nodes/win2012-rubyx64.yaml

Loading...

acceptance/config/nodes/win2012-rubyx86.yaml

Loading...

acceptance/config/nodes/win2012r2-rubyx64.yaml

Loading...

acceptance/config/nodes/win2012r2-rubyx86.yaml

Loading...