Merge branch '2.6.next' into 2.6.x
cc1f2b39a65eUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' into 2.6.x

2.6.next: maint: Fix ActiveRecord confine issue maint: Fix a test that was missing a require maint: Fix tests that don't run on their own

Details

Provenance

Matt Robinson <matt@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUb4035315aaad: Merge branch 'ticket/2.6.next/maint-fix_active_record_confine' into 2.6.next
rPU52ca8c78c270: Merge branch '2.6.next' into 2.6.x

Branches

Unknown

Tags

Unknown

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPUcc1f2b39a65e: Merge branch '2.6.next' into 2.6.x (authored by Matt Robinson <matt@puppetlabs.com>).Dec 16 2010, 11:50 PM

Changes (16)

Path

Size

lib/

puppet/

parser/

templatewrapper.rb

spec/

integration/

defaults_spec.rb

unit/

application/

agent_spec.rb

filebucket_spec.rb

queue_spec.rb

indirector/

active_record_spec.rb

catalog/

active_record_spec.rb

facts/

active_record_spec.rb

network/

http/

rack/

xmlrpc/

parser/

templatewrapper_spec.rb

rails/

param_value_spec.rb

resource_spec.rb

rPUcc1f2b39a65e

View Options

lib/puppet/parser/templatewrapper.rb

View Options

spec/integration/defaults_spec.rb

View Options

spec/unit/application/agent_spec.rb

View Options

spec/unit/application/filebucket_spec.rb

View Options

spec/unit/application/queue_spec.rb

View Options

spec/unit/indirector/active_record_spec.rb

View Options

spec/unit/indirector/catalog/active_record_spec.rb

View Options

spec/unit/indirector/facts/active_record_spec.rb

View Options

spec/unit/network/http/rack/xmlrpc_spec.rb

View Options

spec/unit/network/http/rack_spec.rb

View Options

spec/unit/network/http/webrick_spec.rb

View Options

spec/unit/network/xmlrpc/client_spec.rb

View Options

spec/unit/parser/collector_spec.rb

View Options

spec/unit/parser/templatewrapper_spec.rb

View Options

spec/unit/rails/param_value_spec.rb

View Options

spec/unit/rails/resource_spec.rb

Merge branch '2.6.next' into 2.6.xcc1f2b39a65eUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (16)

rPUcc1f2b39a65e

lib/puppet/parser/templatewrapper.rb

spec/integration/defaults_spec.rb

spec/unit/application/agent_spec.rb

spec/unit/application/filebucket_spec.rb

spec/unit/application/queue_spec.rb

spec/unit/indirector/active_record_spec.rb

spec/unit/indirector/catalog/active_record_spec.rb

spec/unit/indirector/facts/active_record_spec.rb

spec/unit/network/http/rack/xmlrpc_spec.rb

spec/unit/network/http/rack_spec.rb

spec/unit/network/http/webrick_spec.rb

spec/unit/network/xmlrpc/client_spec.rb

spec/unit/parser/collector_spec.rb

spec/unit/parser/templatewrapper_spec.rb

spec/unit/rails/param_value_spec.rb

spec/unit/rails/resource_spec.rb

Merge branch '2.6.next' into 2.6.x
cc1f2b39a65eUnpublished
Actions