Diffusion puppet 9016662cc108

Merge branch '2.6.next' of github.com:puppetlabs/puppet into 2.6.next
9016662cc108Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' of github.com:puppetlabs/puppet into 2.6.next

'2.6.next' of github.com:puppetlabs/puppet: (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord Remove extra trailing whitespace from lib/puppet/resource.rb (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs (#6707) Fix typo in rest_authconfig.rb (#6689) Make inventory_active_record terminus search quickly (#5662) Fixed tests that didnt stub key_attributes (#5662) Parsedfile doesnt work with mult keyattr (#5661) Creating types dont work with >1 namevar

Details

Provenance

Max Martin <max@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUa6d0e99e97d1: Merge branch 'ticket/2.6.next/5428-handle-0.25.x-storedconfig-data' into 2.6.
rPUc0712d367583: Merge branch '2.6.next' of github.com:puppetlabs/puppet into 2.6.next

Branches

Unknown

Tags

Unknown

Event Timeline

Max Martin <max@puppetlabs.com> committed rPU9016662cc108: Merge branch '2.6.next' of github.com:puppetlabs/puppet into 2.6.next (authored by Max Martin <max@puppetlabs.com>).Mar 15 2011, 11:57 PM

Merged Changes

a6d0e99e97d1 Merge branch 'ticket/2.6.next/5428-handle-0.25.x-storedconfig-data' into 2.6.
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
5d3aa54d86a7 Merge branch 'ticket/2.6.next/6689' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
093f1627025a (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
4c1929952e72 Remove extra trailing whitespace from lib/puppet/resource.rb
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
ff9e2425a58b (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
6260687ee00f Merge branch 'ticket/2.6.x/5662' of https://github.com/stschulte/puppet into 2.
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
626aae793bae Merge branch 'ticket/2.6.x/5661' of https://github.com/stschulte/puppet into 2.
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
25944edd1e2d Merge branch 'ticket/2.6.next/6707' into 2.6.next
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
02626335b5e7 (#6707) Fix typo in rest_authconfig.rb
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
37e988df4870 Merge branch 'ticket/2.6.next/6689' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
8858e40839bd (#6689) Make inventory_active_record terminus search quickly
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
8b98526b0f81 (#5662) Fixed tests that didnt stub key_attributes
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
2a0c970b8f91 (#5662) Parsedfile doesnt work with mult keyattr
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
35dd0702e961 (#5661) Creating types dont work with >1 namevar
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

lib/

puppet/

indirector/

facts/

inventory_active_record.rb

network/

rest_authconfig.rb

provider/

rails/

database/

004_add_inventory_service_tables.rb

inventory_node.rb

spec/

unit/

indirector/

facts/

inventory_active_record_spec.rb

provider/

ssh_authorized_key/

resource_spec.rb

rPU9016662cc108

lib/puppet/indirector/facts/inventory_active_record.rb

Loading...

lib/puppet/network/rest_authconfig.rb

Loading...

lib/puppet/provider/parsedfile.rb

Loading...

lib/puppet/rails/database/004_add_inventory_service_tables.rb

Loading...

lib/puppet/rails/database/schema.rb

Loading...

lib/puppet/rails/inventory_node.rb

Loading...

lib/puppet/resource.rb

Loading...

lib/puppet/type.rb

Loading...

spec/unit/indirector/facts/inventory_active_record_spec.rb

Loading...

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

Loading...

spec/unit/resource_spec.rb

Loading...