Diffusion puppet b2e19b087d48

Merge branch 'stable'
b2e19b087d48Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

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

Kylo Ginsberg <kylo@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU04d62e700fa6: Merge pull request #3393 from rji/maint/stable/acceptance-config-housekeeping
rPU09ef87250ed8: Merge branch 'stable'

Branches

Unknown

Tags

Unknown

Event Timeline

Kylo Ginsberg <kylo@puppetlabs.com> committed rPUb2e19b087d48: Merge branch 'stable' (authored by Kylo Ginsberg <kylo@puppetlabs.com>).Dec 6 2014, 12:59 AM

Merged Changes

04d62e700fa6 Merge pull request #3393 from rji/maint/stable/acceptance-config-housekeeping
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
0d80902460a1 (maint) acceptance config cleanup
Author
Roger Ignazio <roger@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (76)

Path

Size

acceptance/

config/

nodes/

	all_but_windows.yaml
	all_linux.yaml

	centos5.yaml
	win2003x86-rubyx86.yaml

	centos6.yaml
	win2003x86-rubyx86.yaml

	fedora18.yaml
	win2003x86-rubyx86.yaml

	fedora19.yaml
	win2003x86-rubyx86.yaml

	fedora20.yaml
	win2003x86-rubyx86.yaml

foss-win-2003r2-ruby193.yaml

	lucid.yaml
	win2003x86-rubyx86.yaml

pe/

centos-5-32ma-32da-32da

centos-5-64ma-64da-64da

centos-6-32ma-32da-32da

centos-6-64ma-64da-64da

centos-6-64mda-sol-10-64a

debian-6-32ma-32da-32da

debian-6-64ma-64da-64da

debian-7-32ma-32da-32da

debian-7-64ma-64da-64da

oracle-5-32ma-32da-32da

oracle-5-64ma-64da-64da

oracle-6-32ma-32da-32da

oracle-6-64ma-64da-64da

redhat-5-32ma-32da-32da

redhat-5-64ma-64da-64da

redhat-6-32ma-32da-32da

redhat-6-64ma-64da-64da

scientific-5-32ma-32da-32da

scientific-5-32mda

scientific-5-64ma-64da-64da

scientific-5-64mda

scientific-6-32ma-32da-32da

scientific-6-32mda

scientific-6-64ma-64da-64da

scientific-6-64mda

sles-11-32ma-32da-32da

sles-11-64ma-64da-64da

ubuntu-1004-32ma-32da-32da

ubuntu-1004-32mda

ubuntu-1004-64ma-64da-64da

ubuntu-1004-64mda

ubuntu-1204-32ma-32da-32da

ubuntu-1204-32mda

ubuntu-1204-64ma-64da-64da

ubuntu-1204-64mda

	precise.yaml
	win2003x86-rubyx86.yaml

	precise_and_lucid.yaml
	win2003x86-rubyx86.yaml

	rhel5.yaml
	win2003x86-rubyx86.yaml

	rhel6.yaml
	win2003x86-rubyx86.yaml

	rhel6_and_rhel5.yaml
	win2003x86-rubyx86.yaml

	rhel7.yaml
	win2003x86-rubyx86.yaml

	squeeze.yaml
	win2003x86-rubyx86.yaml

standalone/

rhel6-and-precise.yaml

	trusty.yaml
	win2003x86-rubyx86.yaml

	wheezy.yaml
	win2003x86-rubyx86.yaml

rPUb2e19b087d48

acceptance/config/nodes/all.yaml

Loading...

acceptance/config/nodes/all_but_windows.yaml

Loading...

acceptance/config/nodes/all_linux.yaml

Loading...

acceptance/config/nodes/centos5.yaml

Loading...

acceptance/config/nodes/centos6.yaml

Loading...

acceptance/config/nodes/fedora18.yaml

Loading...

acceptance/config/nodes/fedora19.yaml

Loading...

acceptance/config/nodes/fedora20.yaml

Loading...

acceptance/config/nodes/foss-win-2003r2-ruby193.yaml

Loading...

acceptance/config/nodes/lucid.yaml

Loading...

acceptance/config/nodes/pe/centos-5-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/centos-5-32mda

Loading...

acceptance/config/nodes/pe/centos-5-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/centos-5-64mda

Loading...

acceptance/config/nodes/pe/centos-6-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/centos-6-32mda

Loading...

acceptance/config/nodes/pe/centos-6-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/centos-6-64mda

Loading...

acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a

Loading...

acceptance/config/nodes/pe/debian-6-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/debian-6-32mda

Loading...

acceptance/config/nodes/pe/debian-6-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/debian-6-64mda

Loading...

acceptance/config/nodes/pe/debian-7-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/debian-7-32mda

Loading...

acceptance/config/nodes/pe/debian-7-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/debian-7-64mda

Loading...

acceptance/config/nodes/pe/debian-7-i386

Loading...

acceptance/config/nodes/pe/oracle-5-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/oracle-5-32mda

Loading...

acceptance/config/nodes/pe/oracle-5-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/oracle-5-64mda

Loading...

acceptance/config/nodes/pe/oracle-6-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/oracle-6-32mda

Loading...

acceptance/config/nodes/pe/oracle-6-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/oracle-6-64mda

Loading...

acceptance/config/nodes/pe/redhat-5-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/redhat-5-32mda

Loading...

acceptance/config/nodes/pe/redhat-5-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/redhat-5-64mda

Loading...

acceptance/config/nodes/pe/redhat-6-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/redhat-6-32mda

Loading...

acceptance/config/nodes/pe/redhat-6-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/redhat-6-64mda

Loading...

acceptance/config/nodes/pe/scientific-5-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/scientific-5-32mda

Loading...

acceptance/config/nodes/pe/scientific-5-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/scientific-5-64mda

Loading...

acceptance/config/nodes/pe/scientific-6-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/scientific-6-32mda

Loading...

acceptance/config/nodes/pe/scientific-6-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/scientific-6-64mda

Loading...

acceptance/config/nodes/pe/sles-11-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/sles-11-32mda

Loading...

acceptance/config/nodes/pe/sles-11-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/sles-11-64mda

Loading...

acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/ubuntu-1004-32mda

Loading...

acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/ubuntu-1004-64mda

Loading...

acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da

Loading...

acceptance/config/nodes/pe/ubuntu-1204-32mda

Loading...

acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da

Loading...

acceptance/config/nodes/pe/ubuntu-1204-64mda

Loading...

acceptance/config/nodes/precise.yaml

Loading...

acceptance/config/nodes/precise_and_lucid.yaml

Loading...

acceptance/config/nodes/rhel5.yaml

Loading...

acceptance/config/nodes/rhel6.yaml

Loading...

acceptance/config/nodes/rhel6_and_rhel5.yaml

Loading...

acceptance/config/nodes/rhel7.yaml

Loading...

acceptance/config/nodes/solaris10.yaml

Loading...

acceptance/config/nodes/solaris11.yaml

Loading...

acceptance/config/nodes/squeeze.yaml

Loading...

acceptance/config/nodes/standalone/rhel6-and-precise.yaml

Loading...

acceptance/config/nodes/trusty.yaml

Loading...

acceptance/config/nodes/wheezy.yaml

Loading...