Merge branch '2.6.next' into 2.6.x
52ca8c78c270Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' into 2.6.x

Details

Provenance

Nick Lewis <nick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU167e84d39d5c: Merge branch 'ticket/2.6.next/4487' into 2.6.next
rPUaf6e08c0a59d: (#5304) Use internal_name rather than real_name for maillist provider

Branches

Unknown

Tags

Unknown

References

tag: Iteration-2010-12-15-2.6.x

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPU52ca8c78c270: Merge branch '2.6.next' into 2.6.x (authored by Nick Lewis <nick@puppetlabs.com>).Dec 16 2010, 7:36 PM

Merged Changes

167e84d39d5c Merge branch 'ticket/2.6.next/4487' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
7f4e058133a0 (#4487) Fix environment column in hosts table
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
dcccdc1d7f31 Merge branch 'maint/2.6.next/safe-pluginhandler' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
3ac50fab8121 maint: restore plugin handler safety
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6e997e819f31 Merge branch 'ticket/2.6.next/5408' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
f38c36c63d64 (#5408) Attributes can be both audited and managed
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
56c91fb2accc Merge branch 'maint/2.6.next/fix-silent-mocha-failures' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
54a1025da96a maint: missing stub
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
1d3192e6d724 maint: missing stub
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
1aa815704036 maint: missing line and filename stubs
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
5e5ee97ae4cd maint: Fully stub partially stubbed test.
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
3d7c8d091d71 maint: remove Puppet.settings stubs
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
52fba89d3415 maint: test was expecting Catalog.find too few times
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
8c134b697d2c maint: broken test not failing due to over-eager exception catching
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
5c8489be9c3e Merge branch 'ticket/2.6.next/1757' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
3e5927773c1d Fix #1757 Change file mode representation to octal
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6c8159326cb1 Merge branch 'ticket/next/5423' into 2.6.next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
84bf02e9ade6 Bug #5423: This moves the home directory property before the uid property, thus…
Author
Jonathan Boyett <jonathan@failingservers.com>
Browse Repository
No Builds
No Audits
93526712755d Merge branch 'ticket/2.6.next/4943' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
1131ad73078c (#4943) Add puppet inspect application
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
276b1516cebd Merge branch 'ticket/2.6.next/5261' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
04c41a08fbb4 Merge branch 'maint/2.6.next/bogus_mongrel_daemonize_test' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
e005cc79facf maint: Remove bogus mongrel test
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
c908fdb520e0 (#5261) Fix #5261 Don't escape Unicode characters in PSON
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
616986da3751 Merge branch 'ticket/2.6.next/5081' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
b27e9b4bd79c [#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading…
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (33)

Path

Size

lib/

puppet/

application/

inspect.rb

configurer/

plugin_handler.rb

external/

pson/

pure/

generator.rb

indirector/

catalog/

resource/

transaction/

type/

file/

util/

spec/

unit/

application/

inspect_spec.rb

configurer/

plugin_handler_spec.rb

configurer_spec.rb

file_serving/

fileset_spec.rb

indirector/

catalog/

active_record_spec.rb

ssl_file_spec.rb

provider/

service/

init_spec.rb

resource/

type_collection_spec.rb

transaction/

change_spec.rb

report_spec.rb

resource_harness_spec.rb

type/

file/

source_spec.rb

file_spec.rb

util/

pson_spec.rb

test/

language/

snippets.rb

lib/

puppettest/

support/

utils.rb

network/

server/

mongrel_test.rb

ral/

type/

file.rb

filesources.rb

rPU52ca8c78c270

View Options

lib/puppet/application/inspect.rb

View Options

lib/puppet/configurer/plugin_handler.rb

View Options

lib/puppet/external/pson/pure/generator.rb

View Options

lib/puppet/indirector/catalog/active_record.rb

View Options

lib/puppet/resource/type_collection.rb

View Options

lib/puppet/transaction/change.rb

View Options

lib/puppet/transaction/event.rb

View Options

lib/puppet/transaction/report.rb

View Options

lib/puppet/transaction/resource_harness.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/file/ensure.rb

View Options

lib/puppet/type/file/mode.rb

View Options

lib/puppet/type/user.rb

View Options

lib/puppet/util/log.rb

View Options

spec/unit/application/inspect_spec.rb

View Options

spec/unit/configurer/plugin_handler_spec.rb

View Options

spec/unit/configurer_spec.rb

View Options

spec/unit/file_serving/fileset_spec.rb

View Options

spec/unit/indirector/catalog/active_record_spec.rb

View Options

spec/unit/indirector/ssl_file_spec.rb

View Options

spec/unit/provider/service/init_spec.rb

View Options

spec/unit/resource/type_collection_spec.rb

View Options

spec/unit/transaction/change_spec.rb

View Options

spec/unit/transaction/report_spec.rb

View Options

spec/unit/transaction/resource_harness_spec.rb

View Options

spec/unit/type/file/source_spec.rb

View Options

spec/unit/type/file_spec.rb

View Options

spec/unit/util/pson_spec.rb

View Options

test/language/snippets.rb

View Options

test/lib/puppettest/support/utils.rb

View Options

test/network/server/mongrel_test.rb

View Options

test/ral/type/file.rb

View Options

test/ral/type/filesources.rb

Merge branch '2.6.next' into 2.6.x52ca8c78c270UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (33)

rPU52ca8c78c270

lib/puppet/application/inspect.rb

lib/puppet/configurer/plugin_handler.rb

lib/puppet/external/pson/pure/generator.rb

lib/puppet/indirector/catalog/active_record.rb

lib/puppet/resource/type_collection.rb

lib/puppet/transaction/change.rb

lib/puppet/transaction/event.rb

lib/puppet/transaction/report.rb

lib/puppet/transaction/resource_harness.rb

lib/puppet/type/file.rb

lib/puppet/type/file/ensure.rb

lib/puppet/type/file/mode.rb

lib/puppet/type/user.rb

lib/puppet/util/log.rb

spec/unit/application/inspect_spec.rb

spec/unit/configurer/plugin_handler_spec.rb

spec/unit/configurer_spec.rb

spec/unit/file_serving/fileset_spec.rb

spec/unit/indirector/catalog/active_record_spec.rb

spec/unit/indirector/ssl_file_spec.rb

spec/unit/provider/service/init_spec.rb

spec/unit/resource/type_collection_spec.rb

spec/unit/transaction/change_spec.rb

spec/unit/transaction/report_spec.rb

spec/unit/transaction/resource_harness_spec.rb

spec/unit/type/file/source_spec.rb

spec/unit/type/file_spec.rb

spec/unit/util/pson_spec.rb

test/language/snippets.rb

test/lib/puppettest/support/utils.rb

test/network/server/mongrel_test.rb

test/ral/type/file.rb

test/ral/type/filesources.rb

Merge branch '2.6.next' into 2.6.x
52ca8c78c270Unpublished
Actions