[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, bug/573551-update-rc.d, created. 2.6.4-373-g83d88e2
Stig Sandbeck Mathisen
ssm at debian.org
Sat Jan 15 18:07:40 UTC 2011
The branch, bug/573551-update-rc.d has been created
at 83d88e218b5f8c940c4f2cc5ba33d3e976ed66bf (commit)
- Shortlog ------------------------------------------------------------
commit 83d88e218b5f8c940c4f2cc5ba33d3e976ed66bf
Author: martin f krafft <madduck at debian.org>
Date: Sat Jan 15 18:57:53 2011 +0100
Use update-rc.d enable/disable (Closes: #573551)
commit 78e838ad3cc08d8e155d895a478ee73f616440d7
Merge: 824907c 27abd84
Author: Nick Lewis <nick at puppetlabs.com>
Date: Fri Jan 7 13:58:44 2011 -0800
Merge branch 'next'
commit 27abd84611564ac573c5fde8abb6b98e6bd3d9b7
Author: Nick Lewis <nick at puppetlabs.com>
Date: Fri Jan 7 13:49:23 2011 -0800
maint: Stop stubbing 'use' on any_instance of Puppet::Util::Settings
This is because of the fix for #5799, which means there will only be a single
instance of Puppet::Util::Settings throughout the lifetime of the spec run.
Paired-With: Paul Berry
commit 04289febd5575ab2bb6aa0b1a121905b09cf227a
Merge: 0f0c70c 8aa8b9d
Author: Nick Lewis <nick at puppetlabs.com>
Date: Fri Jan 7 13:24:54 2011 -0800
Merge branch 'ticket/2.6.next/5799' into next
commit 824907ce0abed0e8c332b873b88705fbccf0d24e
Merge: 03cc835 2d88844
Author: Matt Robinson <matt at puppetlabs.com>
Date: Fri Jan 7 13:16:38 2011 -0800
Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile'
* maint/2.6.next/remove_rspec_options_from_rakefile:
maint: Add vim swap files to .gitignore
maint: Remove rspec options from the Rakefile
Manually Resovled Conflicts:
Rakefile
commit 0f0c70cae2e022d7614b8d847fa42bf95f5c3d0d
Merge: f663182 2d88844
Author: Matt Robinson <matt at puppetlabs.com>
Date: Fri Jan 7 12:18:18 2011 -0800
Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into next
* maint/2.6.next/remove_rspec_options_from_rakefile:
maint: Add vim swap files to .gitignore
maint: Remove rspec options from the Rakefile
Manually Resolved Conflicts:
Rakefile
commit 8aa8b9dbc2437cea8109e4d272018437afe13794
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Jan 6 17:39:03 2011 -0800
(#5799) Simplify report dir creation
This report processor was unnecessarily using Puppet to create a
single directory. This was causing complex failures in any spec
dealing with reports.
Paired-With: Paul Berry
commit 03cc835eb04a5f9e5c1c5bcf6b988378f4bdab69
Merge: 9b2b4ae f663182
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Jan 6 16:01:10 2011 -0800
Merge branch 'next'
commit f663182c28c9d4533ad4c2f897e5fbbf78b16d8e
Merge: c776472 b16e10d
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Jan 6 15:56:31 2011 -0800
Merge branch 'intermediate_merge_branch' into next
commit c7764723578ae64240db7bd2a64f8e6e9fa708ab
Merge: fb8509a 7ed5251
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Jan 6 15:56:16 2011 -0800
Merge branch 'maint/next/mocha_workaround' into next
commit 7ed5251f80b0e37caf6e255875860157f95ee935
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Jan 6 15:24:13 2011 -0800
maint: Work-around for a Mocha bug
Mocha is leaving behind a copy of stubbed methods in the singleton class of the
object on which the method is stubbed. So a later stub to any_instance of the
class isn't seen by the original object.
This change works around the problem by adding a follow-up "test" that removes
the method from the singleton class.
See: https://github.com/floehopper/mocha/issues#issue/20
Paired-With: Paul Berry
commit 2d8884487159a29fa0a6b89379d5fc1b11c2652c
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Jan 6 15:18:59 2011 -0800
maint: Add vim swap files to .gitignore
Paired-with: Jesse Wolfe
commit 3d3baec01466f5745f96c4ece4ade6bdea11e81d
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Jan 6 15:10:35 2011 -0800
maint: Remove rspec options from the Rakefile
Having the Rakefile set RSpec options made it so that the .rspec
(spec.opts in RSpec < 2) file for personal RSpec preferences was
ignored.
It also caused the ci_reporter RSpec options to be ignored which meant
that Hudson couldn't get consumable output from our spec runs.
It's also about time Puppet had a project level .gitignore file so that
if people want personal rspec preferences (color or a different print
format for example) in a .rspec file, those changes don't actually get
checked in.
Paired-with: Jesse Wolfe
commit b16e10dba6606b808ef195f4b57f2e8c66cf65ab
Merge: fb8509a 19eb1e7
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Jan 5 17:22:30 2011 -0800
Merge branch '2.6.x' into next
Conflicts:
Rakefile
lib/puppet/resource/type_collection.rb
lib/puppet/simple_graph.rb
lib/puppet/transaction.rb
lib/puppet/transaction/report.rb
lib/puppet/util/metric.rb
spec/integration/indirector/report/rest_spec.rb
spec/spec_specs/runnable_spec.rb
spec/unit/configurer_spec.rb
spec/unit/indirector_spec.rb
spec/unit/transaction/change_spec.rb
commit 19eb1e78e115d10bfb822e510213e4fab9cd2599
Merge: cc1f2b3 83ac3e7
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Jan 5 15:54:00 2011 -0800
Merge branch '2.6.next' into 2.6.x
commit 83ac3e789ddc8dbf40c93460032474870fb16c54
Merge: a05df9f 717670f
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Jan 5 15:47:03 2011 -0800
Merge branch 'maint/2.6.next/5771-spec-fixes' into 2.6.next
commit 717670fa3a6f471c8183dd85443ca2426f4df238
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Jan 5 15:41:31 2011 -0800
(#5771): Fix spec failures associated with rspec upgrade
Due to changes in the spec_helper, some of the specs that use puppettest were
failing when run individually. In the future, it would be nice to remove
puppettest from the specs entirely, as it's old, crufty, and only used for a
couple of things.
Paired-With: Matt Robinson
commit a05df9fec9040a908f28e4c324845ec80daa54eb
Merge: ac11437 52760a4
Author: Nick Lewis <nick at puppetlabs.com>
Date: Tue Jan 4 16:04:34 2011 -0800
Merge branch 'ticket/2.6.next/upgrade_rspec' into 2.6.next
commit 52760a4fb2764d011609c82adb68cc61d0772dc4
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Jan 3 22:19:41 2011 -0800
(#5771) Upgrade rspec to version 2
The biggest change is that we no longer need to monkey patch rspec to
get confine behavior. Describe blocks can now be conditional like
confine used to be. "describe" blocks with "shared => true" are now
"shared_examples_for".
Paired-With: Nick Lewis
commit ac114371fc161a48fc48bf68944846a1defbc6c4
Merge: a640278 7603b05
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Jan 3 17:30:12 2011 -0800
Merge branch 'maint/2.6.next/remove_stray_p' into 2.6.next
commit 7603b055d10810a901b6e0f9d9de89e00b842058
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Jan 3 17:27:14 2011 -0800
maint: remove stray debug statement.
I accidentally committed a debug statement. Now I am removing it.
commit a6402781a1e0403a113b51e784d929c29f440db1
Merge: 68464b7 7661ba8
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Jan 3 16:32:58 2011 -0800
Merge branch 'maint/2.6.next/speed_up_slow_inspects' into 2.6.next
commit 7661ba82a3c765d4bf8a400a3c770f351c541f96
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Jan 3 16:28:24 2011 -0800
maint: Prune #inspect methods on various objects
Ruby's default #inspect method can lead to printing factorial-order
output for large graphs of objects. Since we have large graphs of
objects, this is not optimal.
This patch replaces a few well-connected objects' #inspect methods with
methods that produce reduced output, and are thus much faster.
Paired-With: Nick Lewis <nick at puppetlabs.com>
commit 68464b79070fdf28b623f1e11beb4908a7be81a7
Merge: 10f89de 80bfb54
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Jan 3 15:52:07 2011 -0800
Merge branch 'ticket/2.6.next/5758' into 2.6.next
* ticket/2.6.next/5758:
(#5758) Verify that report events are correctly created
Prep work for #5758: set audited=true on all audit events
Prep work for #5758: clean up initializer for Puppet::Transaction::Event
commit 80bfb541f06f36e37fe34d0c1635c317085ea333
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Jan 3 15:48:15 2011 -0800
(#5758) Verify that report events are correctly created
Added code to resource_harness_spec to test all the attributes of
report events, not just the log messages.
Paired-with: Matt Robinson <matt at puppetlabs.com>
commit de85f8d598606fc4fcce59228f5cb6d2715e66b5
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Jan 3 15:47:15 2011 -0800
Prep work for #5758: set audited=true on all audit events
Previously, events would only have audited=true if auditing was
enabled AND there had been a change in an audited parameter.
Paired-with: Matt Robinson <matt at puppetlabs.com>
commit e162da905549002d31eb9ff159406cec8b659046
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Jan 3 15:45:41 2011 -0800
Prep work for #5758: clean up initializer for Puppet::Transaction::Event
Puppet::Transaction::Event#initialize() contained unnecessary code
that allowed the properties of an event to be passed in as separate
arguments. This was never used.
Paired-with: Matt Robinson <matt at puppetlabs.com>
commit 10f89de6e55429fcb055b15a513d01e6e20f03b9
Merge: f1abd3c 06a8d1e
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Jan 3 11:32:39 2011 -0800
Merge branch 'ticket/2.6.next/5698' into 2.6.next
commit 06a8d1ee8775ba8693ced002f5972bbfc346ebf8
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Tue Dec 28 17:18:55 2010 -0800
Fix #5698 puppet inspect shouldn't report of attributes of deleted files
If a resource is absent, then reporting that its properties are all
":absent" is not particularly correct. This patch makes the `inspect`
application's reports behave more like `apply` reports, and skip
properties other than :ensure for absent resources.
Reviewed-By: Nick Lewis <nick at puppetlabs.com>
commit f1abd3c16eccfac60a19462a244c55924b737c2d
Merge: 0b78dec 1f72c31
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Dec 30 13:29:47 2010 -0800
Merge branch 'ticket/2.6.next/5715' into 2.6.next
* ticket/2.6.next/5715:
(#5715) Added attributes resource_type and title to Puppet::Resource::Status.
(#5715) Removed attribute source_description from the YAML representation of Puppet::Resource::Status.
(#5715) Removed unnecessary attributes from YAML of Puppet::Transaction::Event.
(#5715) Make certain report attributes always present.
(#5715) Changed the type of metric names to always be strings.
(#5715) Add status attribute to reports.
(#5715) Made the report "calculate" methods strictly functional.
(#5715) Made the changes/total and events/total metrics always present
(#5715) Refactor in preparation for adding a status attribute to reports.
(#5715) Added total time to inspect reports and made inspect metrics more consistent.
(#5715) Removed Puppet::Transaction::Report#external_times from YAML output.
(#5715) Added total time metric to apply reports.
(#5715) Removed redundant attribute Transaction::Event#version
(#5715) Removed redundant attribute Resource::Status#version
(#5715) Removed Puppet::Util::Log#version.
(#5715) Removed the unused attribute Puppet::Transaction::Event#node
(#5715) Removed Resource::Status#skipped_reason. It was never used.
(#5715) Prep work: Fixed add_statuses in report_spec.
commit 1f72c31f9e0223e71e2729da96e0e98ebea5417e
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Dec 30 11:26:30 2010 -0800
(#5715) Added attributes resource_type and title to Puppet::Resource::Status.
These new attributes save report processors from having to parse the
"resource" attribute.
commit a6cd736379d37c5ca205d74d8a957a6c79f95548
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Dec 30 11:18:57 2010 -0800
(#5715) Removed attribute source_description from the YAML representation of
Puppet::Resource::Status.
This attribute is only used for properly generating log messages and
was never intended to appear in reports.
commit 98db2da4e9b35f6260bf07c641550b380b603baa
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Dec 30 11:01:23 2010 -0800
(#5715) Removed unnecessary attributes from YAML of Puppet::Transaction::Event.
The removed attributes are file, line, resource, tags,
source_description, and default_log_level. These attributes were all
redundant with those in Puppet::Resource::Status.
commit bd4a8a13a85e6d64c987765cb83b1ebd4a63a341
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Dec 29 16:00:23 2010 -0800
(#5715) Make certain report attributes always present.
The attributes Puppet::Resource::Status#changed,
Puppet::Resource::Status#out_of_sync, and
Puppet::Transaction::Event#audited used to only appear in reports when
their state was true. Now they appear always.
commit 716ee1cd76a2b30c10e715bca3e22896d9c4e36f
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 15:33:14 2010 -0800
(#5715) Changed the type of metric names to always be strings.
commit 037eac4383ed5a5e9cdde765b607a180209bad1e
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 14:49:16 2010 -0800
(#5715) Add status attribute to reports.
commit e4a2e049dc9f77569a2dac042e9e847ef34f037d
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 14:35:58 2010 -0800
(#5715) Made the report "calculate" methods strictly functional.
These methods previously stored the metrics as a side effect; now they
simply compute the metrics and return them.
commit 71db5be0ecc5ab591e01974ba109f621348fdea0
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 14:26:47 2010 -0800
(#5715) Made the changes/total and events/total metrics always present
Previously these metrics were omitted when their values were zero.
commit a4e40f4dd5990df4dc6b2be065e82a142a31b6fc
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 14:09:57 2010 -0800
(#5715) Refactor in preparation for adding a status attribute to reports.
Renamed Puppet::Transaction::Report#calculate_metrics to
finalize_report, in preparation for adding more functionality to this
method.
Removed Puppet::Transaction#send_report and
Puppet::Transaction#generate_report. The former was never used, and
the latter was unnecessary.
commit 15dda94c7d1e117273928f094b46a81b3f842c1f
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 12:29:53 2010 -0800
(#5715) Added total time to inspect reports and made inspect metrics more consistent.
Inspect reports now contain all the metrics that apply reports do, and
use the same code path for creating them.
commit d1bcdec38e5493e1e44192eaf07da2e88b8eb850
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 12:15:26 2010 -0800
(#5715) Removed Puppet::Transaction::Report#external_times from YAML output.
This attribute was never intended to be serialized to YAML; it exists
merely as temporary storage for metrics that have not yet been placed
in the report's metrics attribute.
commit 1550bbb218719590431575cb4c200e620680a79d
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 11:53:35 2010 -0800
(#5715) Added total time metric to apply reports.
This was a feature that was present in 0.25.x and was inadvertently
dropped from 2.6.x.
commit 4cc42cda270cd1c04b22bf6e5452c550fb537ebf
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 11:20:46 2010 -0800
(#5715) Removed redundant attribute Transaction::Event#version
commit 1907650515ca68e85e63c73e1a35ec30dbc81b0d
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 11:15:23 2010 -0800
(#5715) Removed redundant attribute Resource::Status#version
commit e596a570b2734ea27eec57a6e3a11843ccb47614
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Dec 28 17:38:57 2010 -0800
(#5715) Removed Puppet::Util::Log#version.
This attribute was only relevant in reports, and in reports it was
redundant with Puppet::Transaction::Report#configuration_version and
Puppet::Transaction::Report#puppet_version.
commit 908e0e09ed94ab6b74aba3b9e4fa95318d8894ef
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Dec 30 10:45:22 2010 -0800
(#5715) Removed the unused attribute Puppet::Transaction::Event#node
commit 0e39ec5bbd06dad0b59436a092c50902913d4a5a
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 11:18:35 2010 -0800
(#5715) Removed Resource::Status#skipped_reason. It was never used.
commit b765f0e7a23af9804f1541437f2caf1d93cc5ed2
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Dec 29 14:49:41 2010 -0800
(#5715) Prep work: Fixed add_statuses in report_spec.
Report_spec contained a helper method called add_statuses which
claimed to add a status object n times. It actually always added it 3
times, and fortunately callers always specified n=3. Changed this to
be more sane.
commit 0b78decacf508f7586d3d4ee90277b980d4879a2
Merge: 4664460 8631709
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Dec 29 17:33:37 2010 -0800
Merge branch 'ticket/2.6.next/5723' into 2.6.next
commit 8631709d71833e68fbfe40dbee10fe876eb309ea
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Dec 29 17:24:58 2010 -0800
(#5723) Fix failing type/package specs
These tests were failing because they were overly constraining what the code
could do. Because of a bug in Mocha 0.9.8, these failures weren't caught when
the code causing them was first made. These failures were introduced in
7fff7808e25491a5ea1e207b8de3ade0c4f95f4f.
Paired-With: Paul Berry
commit 4664460e0a4a935dab814a3218fc054c13e3cab6
Merge: a17f261 76fe2b3
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Dec 20 16:44:26 2010 -0800
Merge branch 'ticket/2.6.next/5169' into 2.6.next
commit 76fe2b3b24f6c04cd1cff7c8492d479d15258566
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Dec 20 12:17:52 2010 -0800
Implement #5168 and #5169 ctime and mtime are properties
File ctime and mtime are now implemented as read-only properties, so
they can be examined with audit.
commit a17f2616b4cb0a9231745090ace5bb25e7bc77c9
Merge: 13972f7 d11ae78
Author: Paul Berry <paul at puppetlabs.com>
Date: Fri Dec 17 11:25:44 2010 -0800
Merge branch 'ticket/2.6.next/3782' into 2.6.next
* ticket/2.6.next/3782:
[3782] Test isolation problem in test/ral/providers/cron/crontab.rb
commit d11ae78871cf9b65e15497e55c98851ca3cbfd15
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Aug 31 11:46:36 2010 -0700
[3782] Test isolation problem in test/ral/providers/cron/crontab.rb
The test in question (test_parse_line) was nondeterministic because it
was relying on the sort order of a Hash whose keys were symbols. When
the sort order caused a blank line to appear at the end of the file
under test, the blank line was elided by the crontab parser, causing a
failure.
Modified the test to execute in a deterministic order that doesn't
place the blank line at the end.
commit 13972f7b2ca37906ee351f3ffa69cf3000a4c54b
Merge: 519e385 4d3030c
Author: Paul Berry <paul at puppetlabs.com>
Date: Fri Dec 17 11:06:42 2010 -0800
Merge branch 'maint/2.6.next/5408' into 2.6.next
* maint/2.6.next/5408:
Modified the behavior of Puppet::Resource::Status as follows:
(#5408) Reworked ResourceHarness so that code is clearer and all behaviors are tested
commit 4d3030c6dd67dcb1f6116e7e3d09ddcd20ee726b
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Dec 16 16:23:34 2010 -0800
Modified the behavior of Puppet::Resource::Status as follows:
- #change_count now only counts events that represent successful
changes. It does not count failures, audits, or noops.
- #changed is equivalent to #change_count > 0.
- #out_of_sync_count (a new attribute) counts all events except audits.
- #out_of_sync is equivalent to #out_of_sync_count > 0.
This should hopefully make the summary statistics in reports more useful.
commit 7fff7808e25491a5ea1e207b8de3ade0c4f95f4f
Author: Paul Berry <paul at puppetlabs.com>
Date: Fri Dec 17 10:59:12 2010 -0800
(#5408) Reworked ResourceHarness so that code is clearer and all behaviors are tested
This patch removes the Puppet::Transaction::Change class and replaces
it with a method,
Puppet::Transaction::ResourceHarness#apply_parameter. The new code is
shorter, more thoroughly unit tested, and addresses known bugs in
the interaction between auditing and performing changes.
This code does not address drawbacks in the report output (for example
a resource is still flagged as changed even if it merely contains
audit information); those will be addressed in a follow-up patch.
commit 519e3857c7edf0d007dd3d4924d27ae552a9b457
Merge: 367633b d516f63
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Dec 16 16:23:52 2010 -0800
Merge branch 'ticket/2.6.next/5493' into 2.6.next
commit d516f6385e0ee044603c403ecc6f96606730f8f2
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Dec 16 16:17:17 2010 -0800
(#5493) Add report_format, puppet_version, and configuration_version to Reports
Current report formats are:
0: 0.25 reports and earlier
1: 0.26.1 - 0.26.4 reports
2: 0.26.5 and beyond
Paired-With: Jesse Wolfe
commit 093c45f7bffb91b869daaf5c6f97383a90e70a18
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 23 11:47:36 2010 -0800
(#5375) Rework puppet apply to use configurer.run
Puppet apply used to contain code that duplicated the functionality of
configurer.run. Refactored to share code.
Paired-with: Jesse Wolfe <jesse at puppetlabs.com>
commit 9b2b4aebed29f035415c1f7324943d3ba2993ea2
Merge: a2ff092 fb8509a
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 16 15:06:31 2010 -0800
Merge branch 'next'
* 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
commit fb8509acbd947712cac094a49227d28a16a366aa
Merge: 480c399 cc1f2b3
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 16 14:59:06 2010 -0800
Merge branch '2.6.x' into next
* 2.6.x:
maint: Fix ActiveRecord confine issue
maint: Fix a test that was missing a require
maint: Fix tests that don't run on their own
Manually Resolved Conflicts:
spec/unit/network/http/rack/xmlrpc_spec.rb
spec/unit/network/http/rack_spec.rb
spec/unit/network/http/webrick_spec.rb
spec/unit/parser/templatewrapper_spec.rb
spec/unit/rails/param_value_spec.rb
spec/unit/rails/resource_spec.rb
commit cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4
Merge: 52ca8c7 b403531
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 16 14:50:39 2010 -0800
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
commit 367633b7e67ff127c0fc8a12c2268941572a7837
Merge: b403531 e99a3ea
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Dec 16 14:47:23 2010 -0800
Merge branch 'ticket/2.6.4/5566' into 2.6.next
commit e99a3ea6fc2b30ed7bcbd3c1bc011b38d92f57b2
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Dec 16 14:10:20 2010 -0800
Fix #5566 none, mtime, and ctime checksum types can write file contents
The #write method in lib/puppet/type/file/content.rb relies on the block
passed to #sum_stream getting executed. "none", "mtime", and "ctime"
aren't real checksums, so they violated that assumption and just
returned empty results. This patch causes that block to get executed.
commit b4035315aaad37df97d4e620b4f972cad201d04f
Merge: d211dc9 d74e8e1
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 16 14:08:45 2010 -0800
Merge branch 'ticket/2.6.next/maint-fix_active_record_confine' into 2.6.next
* ticket/2.6.next/maint-fix_active_record_confine:
maint: Fix ActiveRecord confine issue
commit d74e8e18047a4cbc2e77802324eb97a07a4ddb63
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 16 14:02:11 2010 -0800
maint: Fix ActiveRecord confine issue
We made a class that inherited from ActiveRecord, but did so outside a
block so the confine wasn't skipping it when ActiveRecord wasn't
installed. Moving that class inside a before block caused the confine
to work properly.
Paired-with: Nick Lewis
commit d211dc9b7b756634d8bb568454d06aa6b0f66b5b
Merge: 167e84d 6daeb16
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Dec 16 13:43:20 2010 -0800
Merge branch 'maint/2.6.next/fix-test-dependency-problems' into 2.6.next
commit 6daeb1687004c083d4e3cc72e883b0cab328eae2
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Nov 22 11:59:18 2010 -0800
maint: Fix a test that was missing a require
Paired-with: Nick Lewis
commit 5db696b605ebb331d5af3e640e68978c4f6d604d
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Nov 22 14:56:49 2010 -0800
maint: Fix tests that don't run on their own
From the spec directory I found all the specs that fail when run on their own.
for TEST in `find . -name "*.rb" -type f`; do
spec $TEST > /dev/null 2>&1
if [[ $? != 0 ]]; then
echo $TEST
fi
done
All of them were cases of missing requires.
Paired-with: Nick Lewis <nick at puppetlabs.com>
commit a2ff092d8302e09aa79f9bb16636f8298316c3c7
Merge: 4b35402 480c399
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Dec 16 11:34:09 2010 -0800
Merge branch 'next'
commit 480c399f183627f5f588e9dc9f5f86f683c0e468
Merge: 73397a2 52ca8c7
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Dec 16 11:30:51 2010 -0800
Merge branch '2.6.x' into next
Manually Resolved Conflicts:
lib/puppet/resource/type_collection.rb
spec/unit/configurer_spec.rb
spec/unit/indirector/catalog/active_record_spec.rb
spec/unit/resource/type_collection_spec.rb
spec/unit/transaction/resource_harness_spec.rb
commit 52ca8c78c270b93ce997217900a3d333ad8154cc
Merge: af6e08c 167e84d
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Dec 16 10:36:55 2010 -0800
Merge branch '2.6.next' into 2.6.x
commit 73397a24db7e715c7712def75612dc4a5071ca7f
Merge: 8a03adf b94c1b4
Author: Matt Robinson <matt at puppetlabs.com>
Date: Tue Dec 14 11:54:00 2010 -0800
Merge branch 'ticket/next/5427' into next
* ticket/next/5427:
(#5427) Using Propery::OrderedList for host_alias
(#5427) Remove redundant testunit tests
commit b94c1b444d76a7fa1bcd63dd6ba653abf0b49826
Author: Stefan Schulte <stefan.schulte at taunusstein.net>
Date: Thu Nov 18 23:38:10 2010 +0100
(#5427) Using Propery::OrderedList for host_alias
This uses the propertyclass Puppet::Property::OrderedList to represent
the list of host_aliases. This lets us remove the in_sync, should_to_s
etc overrides.
In the provider class the list is represented by a string (=no array)
so there were a few changes necessary as well.
Because Puppet::Property::List uses the specified delimiter when
converting should values to strings, I changed the delimiter to a simple
space instead a tab. This keeps messages produced by puppet in a nice
format.
The tests had to be changed to work with the new behaviour of
host_aliases. There are a few additional tests as well.
commit cca3436db8ba90eeaeefd8a58567becfcb330acc
Author: Matt Robinson <matt at puppetlabs.com>
Date: Tue Dec 14 11:51:13 2010 -0800
(#5427) Remove redundant testunit tests
These tests are now better tested in the specs.
Paired-with: Nick Lewis
commit 167e84d39d5cdd6b628d4d681b918406e7c896e6
Merge: dcccdc1 7f4e058
Author: Nick Lewis <nick at puppetlabs.com>
Date: Mon Dec 13 17:18:46 2010 -0800
Merge branch 'ticket/2.6.next/4487' into 2.6.next
commit 7f4e058133a0aa6b07bd3402cf01009818066d32
Author: Nick Lewis <nick at puppetlabs.com>
Date: Mon Dec 13 17:07:33 2010 -0800
(#4487) Fix environment column in hosts table
An entire environment object was being stored in a string field,
causing the ZAML form of the environment to be stored. This was
over-ridden to return just the ZAML serialized version of the name.
Since the hosts model didn't know how to interpret a serialized
value, it just returned the ZAML string as the environment. This
patch stringifies the environment before putting it in the hosts
table, which stores it properly.
This patch also introduces a new method of testing using Tableless
ActiveRecord models, which emulate their database schema. This
helps to eliminate some stubbing, but it is still impossible to
fully and accurately test all ActiveRecord interactions without a
real database.
Paired-With: Matt Robinson
commit dcccdc1d7f31b92f73c9a106960a373a009c1a5b
Merge: 6e997e8 3ac50fa
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Dec 13 13:43:22 2010 -0800
Merge branch 'maint/2.6.next/safe-pluginhandler' into 2.6.next
commit 3ac50fab81216789d6d5f7d22cb675d3264674cd
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Dec 13 13:30:24 2010 -0800
maint: restore plugin handler safety
The previous maintenance patch for this file didn't provide as strong of
a guarantee of loading plugins as the code it replaced.
This patch restores the extremely broad exception catching, but prevents
mocha exceptions from being silently ignored.
commit 6e997e819f315d2868de9f3de8ab95c7f6ce8d51
Merge: 56c91fb f38c36c
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 14:57:03 2010 -0800
Merge branch 'ticket/2.6.next/5408' into 2.6.next
commit f38c36c63d6404536e075ce03c3d93e0b2f0a731
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 14:56:19 2010 -0800
(#5408) Attributes can be both audited and managed
This patch makes it possible to both audit and manage an attribute.
It introduces a new field on Event objects "historical_value", which is
the value from state.yaml. The value from the RAL is written to
state.yaml, and then the RAL is updated with the desired value.
Paired-With: Nick Lewis <nick at puppetlabs.com>
Paired-With: Matt Robinson <matt at puppetlabs.com>
commit 56c91fb2accc7c6e53ab8d3c0c60812674c1676a
Merge: 5c8489b 54a1025
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 14:46:30 2010 -0800
Merge branch 'maint/2.6.next/fix-silent-mocha-failures' into 2.6.next
commit 54a1025da96aed794e64080e58a7473afccef5b2
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 14:40:43 2010 -0800
maint: missing stub
This missing stub was raising an exception that, in versions of Mocha
less than 0.9.10, was coincidentally causing the method under test to
behave as expected.
Paired-With: Nick Lewis <nick at puppetlabs.com>
commit 1d3192e6d7242c748477bb560a65fb7148f4df78
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 14:39:24 2010 -0800
maint: missing stub
This missing stub was raising an exception that, in versions of Mocha
less than 0.9.10, was mistaken for the exception that was being tested
for.
Paired-With: Nick Lewis <nick at puppetlabs.com>
commit 1aa815704036ede76b5d2daf5d01f744466e5f50
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 14:12:06 2010 -0800
maint: missing line and filename stubs
Another missing stub exposed by Mocha 0.9.10
commit 5e5ee97ae4cdedbb7975a44fd8a7a4cd4fb86606
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 13:58:55 2010 -0800
maint: Fully stub partially stubbed test.
This test was succeeding in versions of Mocha before 0.9.10, because the
Mocha expectation exceptions were being incorrectly interpreted as if
they were File Not Found exceptions.
commit 3d7c8d091d713eee88a4871da52a72fcc9eb98ee
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 13:58:41 2010 -0800
maint: remove Puppet.settings stubs
This test was stubbing Puppet.settings, instead of setting the values
directly. Exceptions thrown by trying to read other settings were
getting swallowed when running a version of Mocha older than 0.9.10.
Paired-With: Nick Lewis <nick at puppetlabs.com>
commit 52fba89d3415bdb6e7f10640ac059f295ea7cadf
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 12:49:59 2010 -0800
maint: test was expecting Catalog.find too few times
Our code calls Catalog.find multiple times, but this stub did not allow
that. The resulting error was silently ignored on versions of Mocha
before 0.9.10
Paired-With: Nick Lewis <nick at puppetlabs.com>
commit 8c134b697d2c30128f51cd69e47808a051b96b72
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Dec 10 12:46:15 2010 -0800
maint: broken test not failing due to over-eager exception catching
A test was not testing what it claimed, but the failure exception was
getting swallowed by an unnecessarily broad rescue match.
Paired-With: Nick Lewis <nick at puppetlabs.com>
commit 5c8489be9c3ee62c14b524a6d0d4a96dca5b9764
Merge: 6c81593 3e59277
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Wed Dec 8 15:28:54 2010 -0800
Merge branch 'ticket/2.6.next/1757' into 2.6.next
commit 3e5927773c1dc7bc6e9af922fef09149d1599ef6
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 18 16:35:32 2010 -0700
Fix #1757 Change file mode representation to octal
This patch changes the internal representation of a file's mode to a
string instead of an integer. This simplifies the problem of displaying
the value consistently throughout all of puppet.
commit 8a03adf6c121c8d558faaa555051b6feede861ab
Merge: 4fb675d c88afa0
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Tue Dec 7 13:57:20 2010 -0800
Merge branch 'ticket/next/5393' into next
commit c88afa0cb9917177502700fddffcf8a40ca75f90
Author: Derek Olsen <derek.olsen at e-hps.com>
Date: Fri Nov 26 13:57:10 2010 -0800
(#5393) Add "dataset" parameter to the zone provider
This patch extends the zone provider to support the inclusion of one or more datasets in a solaris zone. A dataset is an zfs filesystem that has been delegated from the global zone to the non global zone.
commit 6c8159326cb141a8d5714f65e1854293327e6b75
Merge: 9352671 84bf02e
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Dec 6 16:00:44 2010 -0800
Merge branch 'ticket/next/5423' into 2.6.next
* ticket/next/5423:
Bug #5423: This moves the home directory property before the uid property, thus minimizing room for damage when usermod is in use.
commit 84bf02e9ade666c4ba1bb63476bfd4b35226e7ac
Author: Jonathan Boyett <jonathan at failingservers.com>
Date: Tue Nov 30 13:06:06 2010 -0800
Bug #5423: This moves the home directory property before the uid property, thus minimizing room for damage when usermod is in use.
commit 4fb675d3e028c2429f4fa56bf172d60127c9e608
Merge: d4d51e3 c5a1ca0
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Dec 6 13:28:28 2010 -0800
Merge remote branch 'someword/feature/master/5391' into next
* someword/feature/master/5391:
(#5391) Include additional zfs properties
commit d4d51e3d7720108c063505884cca015aff77eff1
Merge: dac675c 626d756
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Dec 6 13:05:27 2010 -0800
Merge branch 'ticket/next/maint-require_spec_helper' into next
* ticket/next/maint-require_spec_helper:
maint: Use expand_path when requiring spec_helper or puppettest
maint: Fix more order dependent test failures
commit 626d7564467bdc0e9d2d385e9aa10c539d9ed175
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Dec 6 12:01:18 2010 -0800
maint: Use expand_path when requiring spec_helper or puppettest
Doing a require to a relative path can cause files to be required more
than once when they're required from different relative paths. If you
expand the path fully, this won't happen. Ruby 1.9 also requires that
you use expand_path when doing these requires.
Paired-with: Jesse Wolfe
commit b9f3847cd2c7efb954f428224d8d721f9edafd64
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Dec 6 11:57:54 2010 -0800
maint: Fix more order dependent test failures
In commit b67f4c68503ca3abf0a55857da452e46fa75abd5 I fixed one place
that was causing order dependent test failures in
spec/unit/ssl/certificate_request_spec.rb, but missed another case that
was causing a similar failure. To find all the order dependent failures
with that file I ran the following bash script from the spec directory:
for TEST in `find . -name "*.rb" -type f`; do
spec $TEST unit/ssl/certificate_request_spec.rb > /dev/null 2>&1
if [[ $? != 0 ]]; then
echo $TEST
fi
done
Paired-with: Jesse Wolfe
commit 93526712755d5c30e020754a6f759b204921f423
Merge: 276b151 1131ad7
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Dec 2 15:11:18 2010 -0800
Merge branch 'ticket/2.6.next/4943' into 2.6.next
commit 1131ad73078c3e3022b23ee8ab756b44c7de27c9
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Dec 2 10:49:13 2010 -0800
(#4943) Add puppet inspect application
"puppet inspect" will load the locally stored YAML catalog and record
the current state of the audited properties in the catalog. It uses
settings specified in the [agent] configuration section, and will send
its inspect report to the specified server.
Paired-With: Jesse Wolfe
commit dac675c94e6ed1ee67a3081ba7379e000ee93c1c
Merge: 022114d af6e08c
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 2 14:43:15 2010 -0800
Merge branch '2.6.x' into next
* 2.6.x:
(#5304) Use internal_name rather than real_name for maillist provider
Updated CHANGELOG and version for 2.6.4
Revert "(#5304) Use internal_name rather than real_name for maillist provider"
Disable remote ralsh by default
(#5424) Ship auth.conf as part of installing from source
(#5304) Use internal_name rather than real_name for maillist provider
Renamed Reductive to Puppet
Manually Resolved Conflicts:
lib/puppet/provider/maillist/mailman.rb
commit 276b1516cebd8813cb2369932ce9b2754247f9a2
Merge: 04c41a0 c908fdb
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 2 11:27:56 2010 -0800
Merge branch 'ticket/2.6.next/5261' into 2.6.next
* ticket/2.6.next/5261:
(#5261) Fix #5261 Don't escape Unicode characters in PSON
commit 04c41a08fbb4234d7656be1d442034021a3b0f12
Merge: 616986d e005cc7
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 2 11:27:42 2010 -0800
Merge branch 'maint/2.6.next/bogus_mongrel_daemonize_test' into 2.6.next
* maint/2.6.next/bogus_mongrel_daemonize_test:
maint: Remove bogus mongrel test
commit e005cc79facf74d66a45ae93eadfe3e5737024e4
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 2 11:25:17 2010 -0800
maint: Remove bogus mongrel test
Why test that mongrel responds to daemonize? EVERYTHING responds to
daemonize thanks to activesupport.
Paired-with: Paul Berry
commit c908fdb520e0fc203d49e0c14c4c7cbc193ab262
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 22 15:17:51 2010 -0800
(#5261) Fix #5261 Don't escape Unicode characters in PSON
This patch removes the escaping of valid UTF-8 sequences as "\uXXXX".
This code was unreliable, as it relied on Iconv's ability to convert
those codepoints between UTF-8 and UTF-16, but some versions of Iconv
barf on some valid codepoints.
Invalid UTF-8 sequences are still passed through unchanged. We believe
that this is fine; if you are concerned about complience with the JSON
standard, what we are doing is equivalent to:
* interpreting binary files as Latin-1 encoded character sequences
* JSON-encoding those characters according to RFC 4627
* outputting the JSON as Latin-1
This allows all raw binary files to be transmitted losslessly.
Paired-With: Paul Berry <paul at puppetlabs.com>
commit 022114d8e50b1adb785b38262251979a222e7972
Merge: ab7de67 b67f4c6
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 2 11:09:52 2010 -0800
Merge branch 'maint/next/test_order_failure' into next
* maint/next/test_order_failure:
maint: Restore a default value that can cause order dependent test failures
commit b67f4c68503ca3abf0a55857da452e46fa75abd5
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 2 11:07:03 2010 -0800
maint: Restore a default value that can cause order dependent test failures
If you ran two tests in the following order:
spec spec/integration/network/server/webrick_spec.rb spec/unit/ssl/certificate_request_spec.rb
You got the following test failure:
Cannot save me; parent directory /dev/null/ssl/certificate_requests does not exist
Paired-with: Paul Berry
commit ab7de670a13eff599b6b725513fcb8a67e12136b
Merge: ddeba8b 094a5c8
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Dec 2 10:34:11 2010 -0800
Merge branch 'ticket/next/5211' into next
* ticket/next/5211:
(#5211) Added patch and tests for checking the size of the arrary which is returned
commit 094a5c85fc9b4b1bd00f14193abdf23839905dc7
Author: Steve Nielson <steve at nielsenhq.com>
Date: Mon Nov 22 14:58:31 2010 -0500
(#5211) Added patch and tests for checking the size of the arrary which is returned
commit 616986da3751012cf526ad75fd250abc93e6c52a
Merge: af6e08c b27e9b4
Author: Matt Robinson <matt at puppetlabs.com>
Date: Wed Dec 1 17:34:45 2010 -0800
Merge branch 'ticket/2.6.next/5081' into 2.6.next
* ticket/2.6.next/5081:
[#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading site.pp"
commit b27e9b4bd79c30c7910a02122069695044f05477
Author: Matt Robinson <matt at puppetlabs.com>
Date: Wed Dec 1 17:16:03 2010 -0800
[#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading site.pp"
The fix for #4349 caused --parse-only not to detect syntax errors when
--ignore-import was used by adding a return statement that bypassed the
initial import:
commit 760e418d254a8d2198d2c6eb466d783a5930ef47
def perform_initial_import
+ return if Puppet.settings[:ignoreimport]
The problem that #4349 fixed was more generally fixed in commit
99c1019e1d3402ec8e476dc859d5aaef82ec4f69 for ticket #4798 so the return
statement is no longer needed, so reverting the commit for #4349 does
not reintroduce the problem of an import loop error when running puppet
doc.
Paired-with: Jesse Wolfe
commit af6e08c0a59db951502d0cf8c0ca24f5001e92f1
Author: Nigel Kersten <nigel at puppetlabs.com>
Date: Mon Nov 15 12:36:34 2010 -0800
(#5304) Use internal_name rather than real_name for maillist provider
We've switched to using list_lists --bare which shows the internal_name
rather than "real_name", which is the authoritative identifier.
Doing this also means we have less output to scrub, so the code is simpler.
Modified by Markus as-per discussion with Nigel.
Signed-off-by: Nigel Kersten <nigel at puppetlabs.com>
commit ddeba8bc48f34571328e714a46f4a6c08a79db58
Merge: 701021f 0ab5e0f
Author: Nick Lewis <nick at puppetlabs.com>
Date: Tue Nov 30 16:17:28 2010 -0800
Merge branch 'ticket/next/2495' into next
commit 0ab5e0f779d7261c4a9faf890cef8df52726a82a
Author: Stefan Schulte <stefan.schulte at taunusstein.net>
Date: Sun Nov 21 20:52:49 2010 +0100
(#2495) Better value validation for sshkey
As mentioned in the ticket it is not obvious that aliases do not belong
in the resourcename but have to be specified with the property
"host_aliases". On the puppet-user list I saw someone using this as a
resource
@@sshkey {"$fqdn,$hostname,$ipaddress":
type => rsa,
key => $sshrsakey,
}
Puppet will now write a correct entry to the know_hosts file, but when
it rereads the file, the field $fqdn,$hostname,$ipaddress is split into
name ($fqdn) and host_aliases ([$hostname,$ipaddress]). Since we dont
find the resource the user specified, puppet will put the same key in
the file over and over again. This patch adds a simple validation on
resourcename.
commit 701021f97870b4b0be07440b30a5c53faaf39933
Merge: 29a6873 0747b58
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 30 14:43:16 2010 -0800
Merge branch 'maint/next/remove_save_delegation' into next
* maint/next/remove_save_delegation:
Maint: Modified uses of indirector.save to call the indirection directly.
Maint: Modified tests of indirector.save to call the indirection directly.
Maint: Add a default value for key in Facts::NodeExpirer#save
Maint: Moved auto-signing logic into an indirector extension
Maint: Swap the order of arguments to Indirection#save
commit 0747b58bfef9c6bb5f1f9ac1eb6a7b3955dac2af
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 30 12:06:52 2010 -0800
Maint: Modified uses of indirector.save to call the indirection directly.
This change replaces calls to <model object>.save with calls to <model
class>.indirection.save(<model object>). This makes the use of the
indirector explicit rather than implicit so that it will be easier to
search for all indirector call sites using grep. This is an
intermediate refactor on the way towards allowing indirector calls to
be explicitly routed to multiple termini.
This patch affects production code.
commit f77764de3ace7cc880a77466618a5affe1b61a8e
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 30 12:06:33 2010 -0800
Maint: Modified tests of indirector.save to call the indirection directly.
This change replaces calls to <model object>.save with calls to <model
class>.indirection.save(<model object>). This makes the use of the
indirector explicit rather than implicit so that it will be easier to
search for all indirector call sites using grep. This is an
intermediate refactor on the way towards allowing indirector calls to
be explicitly routed to multiple termini.
This patch affects tests only; the next patch will make the
corresponding change to the code.
commit 7de6af87109062a4c0b038f2f2d93191e6a93e4f
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 30 11:59:45 2010 -0800
Maint: Add a default value for key in Facts::NodeExpirer#save
Changed to match the signature of the method being overridden. This
will allow code to call Facts.indirection.save() without a key.
commit beb85d65e4cced7691163add392f53ec58cb1a3d
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 29 16:32:41 2010 -0800
Maint: Moved auto-signing logic into an indirector extension
Autosigning was previously accomplished by overriding
CertificateRequest#save. This meant that it wouldn't work if
certificate requests were saved via a direct call to Indirection#save.
Changed it to use the indirector :extend mechanism, which works no
matter how the save is invoked.
commit 3063000155ddc475d1703d10cfc13770f687c3b2
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 29 14:52:26 2010 -0800
Maint: Swap the order of arguments to Indirection#save
The first argument was often nil, and the second was mandatory.
commit 29a68730e4157a780f568529fbf32c9907f48731
Merge: cb6e9c9 8766efe
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 30 11:13:18 2010 -0800
Merge branch 'maint/next/remove_indirection_delegation' into next
* maint/next/remove_indirection_delegation:
Maint: Make http handler code call the indirector through ".indirection"
commit 8766efea906f57428ff175cae9355d4b03d499d9
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 30 11:09:20 2010 -0800
Maint: Make http handler code call the indirector through ".indirection"
In commit 71ecad9904c8c48c023e90e5fbea5b26b180c9cf we removed the
delegation from model class to indirection for the "find", "search",
"destroy", and "expire" methods. When we did this we neglected to
modify http handler code to call the indirector directly. This patch
makes the appropriate changes to http handler code.
commit cb6e9c990945501962bf9bf864309e8e6f83b827
Merge: 52f9ef0 71ecad9
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 29 14:33:49 2010 -0800
Merge branch 'maint/next/remove_indirection_delegation' into next
* maint/next/remove_indirection_delegation:
Maint: Refactor code to use <class>.indirection.<method>
Maint: Refactor tests to use <class>.indirection.<method>
commit 71ecad9904c8c48c023e90e5fbea5b26b180c9cf
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 29 11:56:40 2010 -0800
Maint: Refactor code to use <class>.indirection.<method>
Replaced uses of the find, search, destroy, and expire methods on
model classes with direct calls to the indirection objects. Also
removed the old methods that delegated to the indirection object.
commit 14f8160674628340ccfd79baeb84f66cf1e0398a
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 29 11:55:00 2010 -0800
Maint: Refactor tests to use <class>.indirection.<method>
Replaced uses of the find, search, destroy, and expire methods on
model classes with direct calls to the indirection objects. This
change affects tests only.
commit 52f9ef06507d87026936dc90dcb467a728ebd54f
Merge: 2bc6727 0f00bf4
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Nov 24 12:24:58 2010 -0800
Merge branch 'maint/next/remove_dead_monkey_patch' into next
* maint/next/remove_dead_monkey_patch:
Maint: Removed unused monkey patch that connected OpenSSL::PKey::RSA to indirector
commit 0f00bf45872412605a497b3929df0bbb0fa7dd67
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Nov 24 12:22:34 2010 -0800
Maint: Removed unused monkey patch that connected OpenSSL::PKey::RSA to indirector
This file was never being required, and was inconsistent with the way
SSL is used in the indirector.
Paired-with: Jesse Wolfe <jesse at puppetlabs.com>
commit c5a1ca0b34a57366415df60099ab0918a7579469
Author: Derek Olsen <derek.olsen at e-hps.com>
Date: Wed Nov 24 11:11:43 2010 -0800
(#5391) Include additional zfs properties
We added the following zfs properties to the zfs provider
:recordsize, :aclmode, :aclinherit, :primarycache, :secondarycache
Currently zfs users have to chain an exec to the zfs filesystem creation and the inclusion of these properties would allow puppet to set them natively.
commit 4b35402ba85d8842d757becec5c8a7bf4d6f6654
Merge: a7bd163 2bc6727
Author: Nick Lewis <nick at puppetlabs.com>
Date: Tue Nov 23 16:42:06 2010 -0800
Merge branch 'next'
commit 2bc6727b6ac7348dbac98099f1fe0aeb3cd1295f
Merge: 78beb70 3a815e1
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 23 13:32:03 2010 -0800
Merge branch 'ticket/next/5375' into next
commit 3a815e191837f9fc1fb7b6621be607225347f014
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 23 11:47:36 2010 -0800
(#5375) Rework puppet apply to use configurer.run
Puppet apply used to contain code that duplicated the functionality of
configurer.run. Refactored to share code.
Paired-with: Jesse Wolfe <jesse at puppetlabs.com>
commit 78beb7062caa65cd230e92012a29812b4c4af5ed
Merge: e00c582 99f4d2f
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 23 13:27:24 2010 -0800
Merge branch 'maint/next/make_upstart_tests_more_robust' into next
commit 99f4d2fe6c3e9d7483206c0788ba5b3fe9f48454
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 23 13:19:59 2010 -0800
Maint: made upstart tests more robust.
The tests for the upstart provider were attempting to stub
Process::Status.exitstatus. However, this doesn't work (presumably
because Process::Status is implemented in C). As a result, the
upstart spec tests were failing if the most recent exit code was
nonzero. Changed the tests so that instead of stubbing
Process::Status.exitstatus to return zero, they execute a command that
is known to succeed (`true`).
Paired-with: Jesse Wolfe <jesse at puppetlabs.com>
commit e00c582c8977a02200b86f18ccc6debf30abdfed
Merge: 3d2fbf6 9ccd29f
Author: Matt Robinson <matt at puppetlabs.com>
Date: Tue Nov 23 11:18:23 2010 -0800
Merge branch 'ticket/next/2866' into next
* ticket/next/2866:
(#2866) yum should support downgrade.
(#4711) Provide unit tests for yum package provider.
commit 9ccd29f3aacdab03f2ea9a693b5bca928439683b
Author: Dan Bode <bodepd at gmail.com>
Date: Tue Sep 7 18:06:09 2010 -0400
(#2866) yum should support downgrade.
patch originally from Grzegorz Nosek with contributions on
the test from Oliver Hookins.
checks if the current version is greater than the should
version, if so, calls yum downgrade.
Reviewed-by: Matt Robinson
commit 04389f502787c6569ffcfa89eb63d76c3c63d29c
Author: Dan Bode <bodepd at gmail.com>
Date: Tue Sep 7 17:46:39 2010 -0400
(#4711) Provide unit tests for yum package provider.
commit 3d2fbf604f997e6b9fd94edb96419ffa9869e709
Merge: 9914140 0956757
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 22 15:37:04 2010 -0800
Merge branch 'ticket/2.6.x/5261' into next
commit 095675711a89d836f4d0f10978ed5759b93fe76f
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 22 15:17:51 2010 -0800
Fix #5261 Don't escape Unicode characters in PSON
This patch removes the escaping of valid UTF-8 sequences as "\uXXXX".
This code was unreliable, as it relied on Iconv's ability to convert
those codepoints between UTF-8 and UTF-16, but some versions of Iconv
barf on some valid codepoints.
Invalid UTF-8 sequences are still passed through unchanged. We believe
that this is fine; if you are concerned about complience with the JSON
standard, what we are doing is equivalent to:
* interpreting binary files as Latin-1 encoded character sequences
* JSON-encoding those characters according to RFC 4627
* outputting the JSON as Latin-1
This allows all raw binary files to be transmitted losslessly.
Paired-With: Paul Berry <paul at puppetlabs.com>
commit 9914140377a82b6c2de45685f565b2607d8b8364
Merge: a95783f 4a2bbbc
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Nov 22 15:02:12 2010 -0800
Merge branch 'maint/next/all_tests_run_on_their_own' into next
* maint/next/all_tests_run_on_their_own:
maint: Fix tests that don't run on their own
commit 4a2bbbcf197760ce2eb3c257742293794d6fb571
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Nov 22 14:56:49 2010 -0800
maint: Fix tests that don't run on their own
From the spec directory I found all the specs that fail when run on their own.
for TEST in `find . -name "*.rb" -type f`; do
spec $TEST > /dev/null 2>&1
if [[ $? != 0 ]]; then
echo $TEST
fi
done
All of them were cases of missing requires.
Paired-with: Nick Lewis <nick at puppetlabs.com>
commit a7bd1630622cace01d0e4c974c76366e4b3b886c
Merge: d19f36e f3cd668
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Nov 22 13:38:02 2010 -0800
Merge branch 'maint/master/fix_missing_require_test_failure'
* maint/master/fix_missing_require_test_failure:
maint: Fix a test that was missing a require
commit f3cd668b51bd98c7eee32222b550ed1160502b0e
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Nov 22 11:59:18 2010 -0800
maint: Fix a test that was missing a require
Paired-with: Nick Lewis
commit a95783f6d6044789e6a0408976126757d4e9f084
Merge: 9ed1235 7c16215
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Nov 22 12:04:22 2010 -0800
Merge branch 'maint/next/fix_missing_require_test_failure' into next
* maint/next/fix_missing_require_test_failure:
maint: Fix a test that was missing a require
commit 7c162157148240814e67124a5362548933a6db8a
Author: Matt Robinson <matt at puppetlabs.com>
Date: Mon Nov 22 11:59:18 2010 -0800
maint: Fix a test that was missing a require
Paired-with: Nick Lewis
commit 9ed1235c295995b61373b11aa4ae0cc6bb320527
Merge: a10deae ccc944f
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 22 11:56:41 2010 -0800
Merge remote branch 'masterzen/feature/master/4339' into next
Manually resolved conflicts:
spec/unit/configurer_spec.rb
commit a10deae8913f12935726da6944cad627e3277c52
Merge: 2f1e05b 32dcb31
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 22 11:42:43 2010 -0800
Merge branch 'ticket/2.6.x/5370' into next
commit 32dcb31a7a371ea542bf3c733d3d775ef3a8e51d
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 22 11:27:37 2010 -0800
(#5370) Made metrics and --summarize work with Puppet apply
Puppet apply and Puppet agent use different code paths to run the
transaction. In the code path for Puppet apply, we weren't passing
the report to catalog.apply, and as a result catalog.apply was
creating its own report to store metrics in; this report was then
discarded. As a result, reports generated using "puppet apply" had no
metrics, and the "--summarize" option didn't work at all.
Fixed by modifying the "puppet apply" code path to pass the report to
catalog.apply. In the future it would be nice to refactor the two
code paths to be the same.
Paired-with: Jesse Wolfe <jesse at puppetlabs.com>
commit 2f1e05b04b3f1129b6c0ae415c5b0c2c5e62b330
Merge: 2a7863a e825485
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 18 14:58:03 2010 -0800
Merge branch 'maint/next/log_refactoring' into next
commit e8254856a5c9fa532886148cbe2b0f8d87179f01
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 18 11:09:46 2010 -0800
Maint: Added assertion to make sure Log.close_all succeeds
If the hash containing log destinations gets corrupted, Log.close_all
could fail silently. This change adds an exception to make these
failures easier to debug should they ever happen again.
commit cf18353472ce9c4e51157d21882a7f129853fd10
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 18 13:21:35 2010 -0800
Maint: Switched spec tests to use a class rather than Array as the log destination.
Using an Array as a log destination is unreliable because Puppet's log
mechanism stores log destinations in a hash whose key is the
destination itself. Since arrays can change their hash when they are
modified, this was causing the log destination hash to become
corrupted, producing sporadic spec test failures.
commit ee56cfd01fce154da38d5f251f66c495b2013b5d
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 18 11:48:32 2010 -0800
Maint: Improved spec tests
In configurer_spec.rb, replaced some mock classes with actual
Puppet::Transaction::Report objects. In log_spec.rb, stopped using
the Array type as a log destination, since doing so was unreliable.
commit 2a7863a87f685a7bff254cce7e557e9eb143ba7d
Merge: 263cc46 b089392
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 18 14:31:16 2010 -0800
Merge branch 'maint/next/rake_spec_backtraces' into next
commit b089392f988eaa7eed098751596bb12a846d447b
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 18 11:43:34 2010 -0800
Maint: Modified "rake spec" so that it prints full backtraces.
commit 263cc46ce03be7020dfc3e108db44616f5b66dce
Merge: 669741d 6e51d11
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 18 14:24:08 2010 -0800
Merge branch 'ticket/next/5274' into next
commit 6e51d11c53012d5e5d5fa05cce26e13d97e223cb
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 18 14:15:41 2010 -0800
(#5274) Fixed some "rake unit" tests that were inadvertently broken by
commit:ee7d2f92f9d3ec45b5c3a9cd3fe2f5832b17f23b
commit 669741d11f30b051b74b4e118fe6509650fdeed3
Merge: b5261cd cd8126f
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Nov 17 16:53:48 2010 -0800
Merge branch 'maint/next/fix-intermittent-parser-spec-failure' into next
commit cd8126f4422afd452564e37fae501f9c356a751d
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Nov 17 16:52:21 2010 -0800
maint: Fix intermittent parser spec failures
The variable 'ast' was being used as shorthand for Puppet::Parser::AST,
but a test was also trying to use it as a local variable, causing
problems.
commit b5261cddc1b771fea57a14ea7174ec6d801076d5
Merge: 68b1404 2052f36
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Nov 17 16:01:06 2010 -0800
Merge branch 'ticket/next/5274' into next
commit 2052f3611fd18cb93a43f4cfb547c9c9205a8952
Author: Stefan Schulte <stefan.schulte at taunusstein.net>
Date: Wed Nov 17 23:28:56 2010 +0100
(#5274) New tests for new hosttype/parsedprovider
Just a few additional tests for the new property "comment" of the
host type.
commit ee7d2f92f9d3ec45b5c3a9cd3fe2f5832b17f23b
Author: Stefan Schulte <stefan.schulte at taunusstein.net>
Date: Wed Nov 17 23:15:46 2010 +0100
(#5274) New comment property for the hosttype
When the parsefile provider for host parses /etc/hosts, it throws any
inlinecomment away. As a result they are also purged in /etc/hosts after
a puppetrun that detects a change. That could be dangerous because you
will lose information even about unmanaged resources.
So if you have something like
192.168.0.1 hostentry_not_managed_by_puppet # Important comment
in /etc/hosts the endresult will be
192.168.0.1\thostentry_not_managed_by_puppet
This patch introduces a new property "comment" for the host type. The
provider is nearly a complete rewrite and a lot shorter and hopefully
easier to understand.
commit 8efdc769db2e144fe61eccbb1663a1c9594b09ab
Author: Stefan Schulte <stefan.schulte at taunusstein.net>
Date: Wed Nov 17 22:59:47 2010 +0100
(#5274) Tests for hostprovider removes comments
I noticed that the hostprovider will remove all inline comments from the
/etc/hosts file, when puppet updates at least one entry. Puppet will also
remove comments from entries, the user doesnt want to manage with
puppet.
To split up changes a bit this commit will only introduce tests for the
host type and the hostprovider. A few will fail, indicating the bug:
The hostprovider parses all entries and builds a hash. When building
the recordhash all comments are discarded. When puppet has to update at
least one entry it uses the to_line function to convert the record hash
back to a file. Because the comments are not stored in the hash, they
cannot be written back to the file.
commit 68b1404804d239670092a40607eacbf03757ba16
Merge: a32bd16 b753d83
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Nov 17 15:33:00 2010 -0800
Merge branch 'ticket/next/5288' into next
commit a32bd16c6f3311c3f836346ac17ce80c777ac85f
Merge: e6ec646 28e5772
Author: Nick Lewis <nick at puppetlabs.com>
Date: Wed Nov 17 15:30:12 2010 -0800
Merge branch 'ticket/next/5304' into next
commit 28e5772d035057e1fe80e6092d8c1b463613e9f8
Author: Nigel Kersten <nigel at puppetlabs.com>
Date: Mon Nov 15 12:36:34 2010 -0800
(#5304) Use internal_name rather than real_name for maillist provider
We've switched to using list_lists --bare which shows the internal_name
rather than "real_name", which is the authoritative identifier.
Doing this also means we have less output to scrub, so the code is simpler.
Signed-off-by: Nigel Kersten <nigel at puppetlabs.com>
commit e6ec6468c4a9eec58dc155858665a70eee4dfb8c
Merge: fb2b9e6 53bb805
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Nov 17 15:19:15 2010 -0800
Merge commit '2.6.3' into next
Resolved conflicts manually:
spec/integration/indirector/bucket_file/rest_spec.rb
spec/integration/indirector/certificate_revocation_list/rest_spec.rb
commit d19f36e7e7d498b9ca12c5ce536f3ee3db114279
Merge: 2b8e834 8e2a945
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Nov 17 14:17:44 2010 -0800
Merge branch 'next'
commit fb2b9e65990477e81728402afa1aab6fbe4a9c7e
Merge: ed49313 8e2a945
Author: Markus Roberts <Markus at reality.com>
Date: Wed Nov 17 06:18:42 2010 -0800
Merge branch 'next' of git://github.com/puppetlabs/puppet into next
commit ed49313c025131fa7a4697e834233a6e952ab6dd
Merge: 0d24ea3 3c44121
Author: Markus Roberts <Markus at reality.com>
Date: Wed Nov 17 06:02:05 2010 -0800
Merge branch 'ticket/next/4590' into next
Conflicts:
lib/puppet/util/monkey_patches.rb
-- two unrelated additions had been made, kept them both.
commit 8e2a945368f8144947d8ada9542191f38358520b
Merge: 0d24ea3 6c7290b
Author: Matt Robinson <matt at puppetlabs.com>
Date: Tue Nov 16 14:24:14 2010 -0800
Merge branch 'ticket/next/5079' into next
* ticket/next/5079:
(#5079) Refactor and cleanup mcxcontent provider
(#5079) Move methods around to make it clearer whether they're public or private
commit 6c7290b4ddff112f97fd6ecf992f901ded953507
Author: Matt Robinson <matt at puppetlabs.com>
Date: Tue Nov 16 11:30:38 2010 -0800
(#5079) Refactor and cleanup mcxcontent provider
This is a rework for diff clarity of a patch submitted by
Sandor Szuecs <sandor.szuecs at fu-berlin.de>
Reviewed-by: Paul Berry <paul at puppetlabs.com>
commit c643e98c57e781353bfac55e7edb6690450076e3
Author: Matt Robinson <matt at puppetlabs.com>
Date: Tue Nov 16 11:21:35 2010 -0800
(#5079) Move methods around to make it clearer whether they're public or private
One method was showing up as a private class method, which turns out
isn't possible, so it got moved into the public section.
This is a rework for diff clarity of a patch submitted by
Sandor Szuecs <sandor.szuecs at fu-berlin.de>
Reviewed-by: Paul Berry <paul at puppetlabs.com>
commit b753d836c5ea18333a1199b20b5c495f562f2af4
Author: James Turnbull <james at lovedthanlost.net>
Date: Sun Nov 14 09:16:59 2010 +1100
Fixed #5288 - Changed report default to true
commit ccc944f21a259f0216b0bfd4873c98d89127a753
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date: Sat Nov 13 11:41:18 2010 +0100
Fix #4339 - Locally save the last report to $lastrunreport
Using the cache terminus system, when --report is on, we are now
caching the last report as a yaml file in the $lastrunreport file
(which by default is $statedir/last_run_report.yaml).
Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>
commit 8ab1aba853231a5e541346955dcd502a67992eb6
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date: Fri Nov 12 13:41:00 2010 +0100
Fix #4339 - Allow puppet apply to save last run summary
Puppet apply inconditionally saves its last run summary
like puppet agent.
Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>
commit 4d31430275016c9abbd4f621e731ff2eeb1718e5
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date: Fri Nov 12 13:39:41 2010 +0100
Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yaml
Once a configuration run is done, puppetd will save on the node a
yaml summary report roughly akin to:
---
time:
notify: 0.001025
last_run: 1289561427
schedule: 0.00071
config_retrieval: 0.039518
filebucket: 0.000126
resources:
changed: 1
total: 8
out_of_sync: 1
events:
total: 1
success: 1
changes:
total: 1
This is almost an hash version of the current --summarize output, with
the notable exception that the time section includes the last run unix
timestamp.
The whole idea is to be able to monitor locally if a puppetd does its job.
For instance this could be used in a nagios check or to send an SNMP trap.
The last_run information might help detect staleness, and this summary
can also be used for performance monitoring (ie time section).
The resource section can also show the number of failed resources.
Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>
commit 0d24ea3583c4cd6a4583f4788686a4f9e02cb994
Merge: 7c78080 b0acb02
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Nov 11 13:57:42 2010 -0800
Merge branch 'feature/next/3747' into next
commit b0acb02b568598ec8dba41aa856f74658b2033dd
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Nov 11 13:47:43 2010 -0800
(#3747) Add specs for upstart provider
Paired-With: Matt Robinson
commit 2b772f761e151c3c2be41e1688e9af9a22d73dd0
Author: Nan Liu <nan at puppetlabs.com>
Date: Thu Sep 16 23:13:31 2010 -0700
(#3747) Implement upstart provider
commit 7c7808059a18832234742f0dc3af3f1a034e1033
Merge: 3228a27 6f1416d
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Nov 11 11:26:44 2010 -0800
Merge branch 'ticket/next/4904' into next
commit 6f1416d7a4cec92ccff64d904d5fe799b8ff9a85
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Nov 11 11:14:02 2010 -0800
Fix #4904 Mounts shouldn't remount unless they are ensure=>mounted
After we fixed issue #2730, it is now possible to manage an fstab entry
without asking puppet to try to call mount or unmount on that device.
That fix failed to address the "refresh" behavior of mounts.
We have changed "refresh" to only remount devices that are set to
"mounted", so users can truly manage fstab entries without having
puppet try to remount them.
Paired-With: Paul Berry <paul at puppetlabs.com>
commit 3228a279c6df183309bfa89fb0d890360f6ff697
Merge: 275a224 bf11e7c
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 11 10:23:37 2010 -0800
Merge branch 'maint/next/clean_up_local_branch_in_mail_patches' into next
commit bf11e7c7aa4ce3337c6697d0b25ee2cdd28ba10c
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Nov 11 10:18:04 2010 -0800
Maint: Move "Local-branch:" info below "---"
When running "rake mail_patches", moved the "Local-branch:" info lines
below the "---" line in the e-mail, so that if someone applies the
patch using "git am", the "Local-branch" notation won't show up in the
commit message.
commit 2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78
Merge: 7236a33 275a224
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Nov 10 16:05:15 2010 -0800
Merge branch 'next'
This marks the end of the agile iteration from 11/3-11/10.
commit 275a224ee245577c4213b3a21bf1e98301740a4e
Merge: e62870f f2537d8
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 16:47:01 2010 -0800
Merge remote branch 'masterzen/tickets/2.6.x/5023' into next
commit e62870f63c63644a7719636f211c8e821695cc20
Merge: 0f5c57f 04515cf
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 15:43:26 2010 -0800
Merge branch 'feature/master/5198' into next
commit 04515cfb1230d6bf0fd88910c91715d1d94faeae
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 15:42:48 2010 -0800
(#5198) Added a spec test for new TB unit
commit 0f5c57f0f81879ec0bf8be0350ad87ac9778527d
Merge: 777d19e 7d35a47
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 15:27:49 2010 -0800
Merge remote branch 'jamtur01/tickets/2.6.x/5108' into next
commit 777d19ec48616bd29d66190c94ce6bdba00a5692
Merge: 1d708a6 4d1681e
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 15:16:16 2010 -0800
Merge remote branch 'jeffmccune/ticket/2.6.x/5062' into next
commit 1d708a67c7db3a631a5577f8b26232c248862eca
Merge: 22d81f0 80adb39
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 15:13:38 2010 -0800
Merge commit '2.6.3rc2' into next
commit 80adb39d1f4e87fe2fa12bd03df335fc285c0bb6
Merge: 2279fe1 244213c
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 15:11:36 2010 -0800
Merge commit '2.6.3rc2' into next
Manually resolved conflicts:
lib/puppet/parser/ast/resource.rb
spec/unit/parser/ast/resource_spec.rb
commit 22d81f0b319b260aa4cf4f6bbc5948fb6b1d4db9
Merge: 2279fe1 4506dfe
Author: Matt Robinson <matt at puppetlabs.com>
Date: Tue Nov 9 14:19:58 2010 -0800
Merge branch 'ticket/next/5150' into next
* ticket/next/5150:
(#5150) Make fact REST terminus configurable to connect to inventory service
commit 2279fe12b32bd626066d9b7637367fcbb293c29b
Merge: 0aab84f 631c5a8
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 13:37:43 2010 -0800
Merge branch 'maint/next/add_local_branch_to_mail_patches' into next
commit 631c5a8e455808dbc919211b5151fd501f6475c9
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 13:35:59 2010 -0800
Maint: Add "Local-branch:" info to mails sent by "rake mail_patches"
commit 0aab84ffa6721acbe16b64263bbab4134652e734
Merge: a548503 f0a1467
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 12:09:33 2010 -0800
Merge branch 'maint/next/clean_up_agent_spec' into next
commit a54850328bded4e6d0ee456eda6c5254dfc379a2
Merge: 442a2e6 2ec1b55
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 12:08:55 2010 -0800
Merge branch 'maint/next/missing_fileserver_requires' into next
commit 2ec1b552e24d3b42391a6471e477422f67ea00bd
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 12:05:49 2010 -0800
Maint: Added missing requires to fileserver.rb.
commit f0a146766a8425513e3c0cb3e3a1b642e59820b9
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Nov 9 11:56:43 2010 -0800
Maint: remove unnecessary stubbing from agent_spec
The agent spec tests were stubbing out all methods related to Puppet
settings, making it difficult to keep these tests maintained. The
tests now function by setting the settings in question.
commit 442a2e6b81f8cdcd2dc0ad24c7c2c66873148e25
Merge: 04fb78c 5c24579
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Tue Nov 9 10:30:18 2010 -0800
Merge branch 'maint/next/forkbomb' into next
commit 5c2457952660e3e531e085757fd85c382676a96e
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Nov 4 17:32:11 2010 -0700
maint: prevent fork bombs by disabling ActiveSupport's Kernel.daemonize
ActiveSupport provides a "daemonize" method on all objects that causes
the ruby process to fork to the background. This is extremely surprising
and dangerous, and some of our spec tests could trigger this
accidentally.
This patch adds a "daemonize" method to Object which shadows the
ActiveSupport version, preventing it from ever being called.
commit 04fb78c911965cc3059d71b356c7e90b4f90ee0d
Merge: 555d6bc f8d1427
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 8 10:54:06 2010 -0800
Merge branch 'feature/next/cert_inspector' into next
commit f8d1427379f16d116c161e7231a26ba5451bc45f
Author: Paul Berry <paul at puppetlabs.com>
Date: Fri Nov 5 11:45:31 2010 -0700
maint: First draft of cert inspector
This script, ext/cert_inspector, takes directory names as command line
arguments, searches those directories for SSL certificates, determines
the type and contents of each cert, maps relationships between
certificates, and prints a summary to standard out.
commit 4506dfeab3eead32f44f4baa461ebba88fe098ab
Author: Matt Robinson <matt at puppetlabs.com>
Date: Fri Nov 5 11:37:27 2010 -0700
(#5150) Make fact REST terminus configurable to connect to inventory service
Puppet masters can now set the inventory_server and inventory_port
option to point to another puppet master that will function as the
central inventory service. When agents connect to the
puppet master, this will send fact data from the puppet master over REST
to the inventory service.
The puppet master itself will still store the client fact data in the
local yaml dir by setting the cache class to yaml.
Getting puppet masters to talk to each other using certs is difficult.
Paired-with: Jesse Wolfe <jesse at puppetlabs.com>
commit 555d6bc671a1a9c128d6f66b2d85b011c84761ba
Merge: 4d3c41e 9e2a0e4
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Nov 4 10:07:15 2010 -0700
Bookkeeping: Merge commit '9e2a0e4' into next
This synchronizes merge commits between master and next.
commit 7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b
Merge: 9e2a0e4 4d3c41e
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Wed Nov 3 20:00:46 2010 -0700
Merge branch 'next'
This marks the end of our first agile iteration.
commit 9e2a0e41dfb253a19180aeea6b66f65ca8d63133
Merge: b1ef091 85543a4
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Wed Nov 3 19:58:38 2010 -0700
Merge commit '85543a4'
This updates `master` to the pre-agile-iteration state.
commit 71a0ceadffc816c08dd979e139fbbf2fa94023a0
Author: Garrett Honeycutt <puppet-dev at garretthoneycutt.com>
Date: Wed Nov 3 16:38:06 2010 -0700
(#5198) add terabyte support to tidy type's size parameter
commit 91ac1629dbefa70382636d6e08768038aeb7f298
Author: Garrett Honeycutt <puppet-dev at garretthoneycutt.com>
Date: Wed Nov 3 16:36:43 2010 -0700
(#5198) add gigabyte reference to docs for tidy type's size parameter
commit 4d3c41ee5316285bb0df38aeeb76746016803c16
Merge: a82f4d2 cfe2025
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Tue Nov 2 11:15:30 2010 -0700
Merge branch 'maint/next/remove-request-object-from-rest-api' into next
commit cfe202539018b27c35ff833152f237bc30569a5f
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 1 18:03:02 2010 -0700
Maint: Remove Indirector::Request objects from HTTP Handler and API V1
This is a maintenance refactor to reduce the dependencies between the
rest API and the implementation of the Indirector. The HTTP Handler code
was creating temporary Request objects that were not actually being
passed to the Indirector.
commit a82f4d23fe5a025b8a9e893d29933f092973f014
Merge: ee4eda8 3d32fe8
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 1 13:48:48 2010 -0700
Merge branch 'ticket/next/5166' into next
commit 3d32fe836eefac1974e00b2763322c998b452ddb
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 1 13:46:21 2010 -0700
(#5166) Inventory service is now searchable by timestamp.
It is now possible to specify queries in the form “meta.timestamp.xx”
where xx is eq,ne,gt,lt,ge,le when searching the inventory service.
commit 1f80cc6ed0caadd82171b4fb9fbe117142cd535e
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 1 13:32:14 2010 -0700
Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding freshness check
commit 6c116015ce4a9e6e7de392047f38b7a9e911bc0c
Author: Paul Berry <paul at puppetlabs.com>
Date: Mon Nov 1 13:26:41 2010 -0700
Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshness
commit ee4eda825c33469e09c88a1f8c4234202cce5ce9
Merge: 5a291ba fb5f859
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 1 11:55:32 2010 -0700
Merge branch 'ticket/next/5164' into next
commit fb5f859cf4a89042a1768b6cbc2dbfc43da49c99
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 1 11:45:27 2010 -0700
Fix #5164 Change Facts timestamp when they are received by the master
This patch causes the puppet master to re-timestamp facts when they are
received by the catalog compiler terminus. This makes the timestamps
more trustworthy, as it means that they are all based upon the same
clock's time.
Paired-With: Paul Berry <paul at puppetlabs.com>
commit 5f0cf4ef50a3676229a1c824b9a730b6951e1c7a
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 1 11:40:48 2010 -0700
Maint: Don't use a stub for a Facts object in the compiler specs
The catalog compiler spec was overstubbing the Node::Facts object,
making it hard to test the interaction between those two systems.
commit 90af9201aefdbd7647827ba772e4564ee05aa6ad
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Nov 1 11:38:38 2010 -0700
Maint: spec/unit/indirector/catalog/compiler_spec.rb wouldn't run by itself
Require puppet/rails so we can run this test alone.
commit 5a291bace188ea5da4812b79583f87206ceb27e1
Merge: 1b60cc3 5bf19e4
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Oct 28 16:05:19 2010 -0700
Merge branch 'ticket/next/4894' into next
* ticket/next/4894:
[#4894] Randomize port on webrick tests
commit 5bf19e40df5e955c045f7a42a070cdbefecbcbe1
Author: Matt Robinson <matt at puppetlabs.com>
Date: Sat Oct 23 08:04:31 2010 -0700
[#4894] Randomize port on webrick tests
This isn't a great test fix, but it should be enough for now to stop the
sporadic test failures in Hudson where webrick isn't releasing it's port
which causes other tests to fail.
I created ticket #5098 as a reminder to refactor these tests later.
Reviewed-by: Paul Berry
commit 1b60cc3c299306d783d9b0e9368726d2c04c9f21
Merge: e559b48 45a9a97
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Oct 28 15:11:01 2010 -0700
Merge branch 'ticket/next/5132' into next
* ticket/next/5132:
(#5132) Provide a query REST interface for inventory
commit 45a9a97285d99db524d5330c236352b29e5884ed
Author: Matt Robinson <matt at puppetlabs.com>
Date: Thu Oct 28 14:49:37 2010 -0700
(#5132) Provide a query REST interface for inventory
This REST interface returns a list of nodes that match a fact query.
Fact queries can use (in)equality testing as a string comparison, and >,
<, >=, <= numerical comparisons. Multiple tests can be done as AND
comparisons, not OR.
The fact queries need to be prefixed by facts, and the comparisons other
than equality are specified with a .comparison_type after the fact name.
This will be better explained in the REST documentation on the website.
Searches that don't match anything now return empty array instead of a
404 error.
commit e559b48d51c53c4a345353de1e196634c7430195
Merge: 0eb6477 2c98db6
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Oct 28 14:41:51 2010 -0700
Merge branch 'feature/next/5148-fix' into next
commit 2c98db60a6a667663745b4e0f5f7ad70c15fc364
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Oct 28 14:30:02 2010 -0700
(#5148) Fix failing spec due to timezone
Time.parse(...) will yield a string in the local timezone. So when
this spec was run in a non -0700 timezone, it was failing, because
it was comparing a string in local time to a string in -0700. This
fixes it to compare to the local string representation of the time.
commit 0eb64776351bdf56910a0ef7802b5917ce29cabf
Merge: 85543a4 c2ea112
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Oct 28 13:24:11 2010 -0700
Merge branch 'feature/next/5148' into next
commit c2ea112de1f08707aa301060b4df24bd0bb6072a
Author: Nick Lewis <nick at puppetlabs.com>
Date: Thu Oct 28 12:49:19 2010 -0700
(#5148) Add support for PSON to facts
Previously, facts could be fetched via the REST API in PSON, but came
back as the to_s representation of a Ruby object, rather than as
proper PSON data. This patch adds to_pson and from_pson to facts, so
they can be properly used with PSON.
commit 7d35a479b760e382638a2efe1881b8bd94704a45
Author: James Turnbull <james at lovedthanlost.net>
Date: Wed Oct 27 09:23:00 2010 +1100
Fixed to #5108 - Change default of service hasstatus property to true
commit 4d1681e05a187e55422bf00de5c932736548be15
Author: Jeff McCune <jeff at puppetlabs.com>
Date: Wed Oct 20 15:22:06 2010 -0700
(#5062) Add envpuppet helper script to ext/
This script helps people quickly test different branches of various
puppet related projects like facter, puppet-scaffold, puppet-dashboard,
etc... It allows the user to simply clone puppet and start running
different puppet version without installing puppet or any other setup
costs.
commit 85543a41978924a42490d0c3f1f5437c95b7c869
Merge: 19ae3df efeb2f4
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 18 13:32:33 2010 -0700
Merge remote branch 'nigel/tickets/2.6.x/4382' into next
commit 19ae3dffa4e52e752149ce90ebf83f9055c2313b
Merge: 2d13fda e3fc5b9
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 18 12:01:29 2010 -0700
Merge commit '2.6.3rc1' into next
commit b1ef091d0209a59ac747568f83416e992db93ea8
Merge: 9f59342 e3fc5b9
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 18 11:57:56 2010 -0700
Merge commit '2.6.3rc1'
commit f2537d8f913ff78f5198dabd43727660010a4480
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date: Sun Oct 17 16:06:50 2010 +0200
Puppet-load: better and safer error reporting
In case of connection, dns or timeout error, puppet-load would not report
the error correctly or could crash.
Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>
commit ce1865f3d0bdcdf89d18e746806645b2b84b5252
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date: Sun Oct 17 16:21:12 2010 +0200
Fix #5023 - puppet-load multiple nodes support
This patch allows puppet-load to compile multiple nodes catalog.
This is done by using multiple --node. Puppet-load will use round-robin
to chose which nodes catalog to ask for a given simulated client.
It is also possible to pass a directory of facts yaml file in which
puppet-load will load given --node facts file.
This can work only if #5020 is applied to the puppetmaster first.
Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>
commit 2d13fdaac56bd5cd57444cc4447081649e18f487
Merge: e6c8296 295c3be
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Tue Oct 12 13:36:54 2010 -0700
Merge commit '2.6.2' into next
commit 9f593429b488a1d3f900757d28ab0432303bd469
Merge: da84c03 295c3be
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Tue Oct 12 12:11:13 2010 -0700
Merge commit '2.6.2'
commit efeb2f4d8d62073e037798b78280dadd2fc7713d
Author: Nigel Kersten <nigelk at google.com>
Date: Mon Oct 11 14:28:53 2010 -0700
Make --mkusers work on OS X, we now find unused uid/gids if unspecified
like other platforms.
commit 3c4412128a50e41380108e5a90f2656329b84492
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Sep 8 11:31:00 2010 -0700
[#4590] SimpleGraph is slow
Rewrote SimpleGraph to use a more efficient internal representation.
To preserve compatibility with older clients, graphs are still
serialized to YAML using the format used by Puppet 2.6. However, a
newer, more compact format can be enabled by setting
"use_new_yaml_format" to true. Deserialization from YAML accepts
either the old 2.6 format or the newer format. In a later release,
once we no longer need to be compatible with 2.6, we will be able to
switch to the new format.
To make deserialization accept multiple formats, it was necessary to
use the yaml_initialize method. This method is not supported in
versions of Ruby prior to 1.8.3, so a monkey patch is included to add
support for it to Ruby 1.8.1 and 1.8.2.
Thanks to Markus Roberts for the SimpleGraph rewrite. Thanks to Jesse
Wolfe for figuring out how to write the yaml_initialize monkey patch.
commit e6c829617ccc120e04f945e8714f792ce29c284d
Merge: 7bdbd13 6b27850
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Tue Oct 5 11:43:32 2010 -0700
Merge remote branch 'paul/ticket/next/4657' into next
This patch conflicts with a backport of itself. This merge resolution
favors the original patch for the code changes, and the 2.6.2 patch for
the specs.
Manually Resolved Conflicts:
lib/puppet/dsl/resource_type_api.rb
lib/puppet/parser/ast/definition.rb
lib/puppet/parser/parser_support.rb
spec/integration/parser/ruby_manifest_spec.rb
spec/unit/dsl/resource_type_api_spec.rb
commit 7bdbd132634f61d91aeee401de15248d936ce71e
Merge: 163ec17 917c520
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 4 20:11:56 2010 -0700
Merge commit '2.6.2rc1' into next
commit 163ec172e06a2b8aab9f9c9247dd45bc0dea3f72
Merge: c9592f0 574812e
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 4 16:31:30 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit '574812e' into next
The API for AST objects has changed, making the initialization of this
spec somewhat more complicated.
Also, git seems to have been confused by whitespace changes.
Manually Resolved Conflicts:
lib/puppet/parser/ast/resource.rb
commit c9592f048331d7728d42f55cb29f5748ec9b1a67
Merge: 6acfdba 021359b
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 4 15:53:58 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit '021359b' into next
There are test failures and merge conflicts in commits following this one.
commit 6acfdba87bdffe4afd6e00cbf3695160f7994357
Merge: 1a00c07 6dd1930
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 4 15:37:19 2010 -0700
Partial merge to 2.6.2rc1 : Merge commits 'd057b90' and '6dd1930' into next
This commit merges in d057b90 with the addition of commit 6dd1930 to fix
some tests that are confined to machines where rrd is installed.
commit 6dd1930ff66f6e89ff3d7edba9cc20126d9cd9a3
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 4 14:01:49 2010 -0700
Fix test failures that fixing #4726 exposed.
The patch for #4726 causes old unit tests of the rrd reporting
infrastructure to run on my machine. These tests were calling the old
report api, which does not succeed.
Also, the rrd settings had unintentionally been moved out of the
:metrics section, making it possible that the rrd report directory would
fail to get created during testing.
commit 1a00c07971c4297bce1b3e0edee3b6b3399e17bb
Merge: d43f799 66cf3a9
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 4 12:22:44 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next
There are test failures in commits following this one.
commit d43f7996b93c394df0bd0994ae7298fb35ad2c5e
Merge: ce9a6f9 99c1019
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Oct 4 11:44:41 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit '99c1019' into next
This conflict was a little too complicated for diff to figure out, but
the resolution is actually fairly mechanical.
Some unit tests changed because they were mocking unnecessarily.
Manually Resolved Conflicts:
lib/puppet/util/rdoc/parser.rb
spec/unit/util/rdoc/parser_spec.rb
commit ce9a6f97ab1784d8bd60eae8b60272c9875b1f84
Merge: c6e824a 8cd1540
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Sat Oct 2 01:14:03 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit '8cd1540' into next
There are merge conflicts with commits following this one.
commit c6e824ad5144957e351892a1d745a127b02f34b3
Merge: 2e189d5 f950061
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Sat Oct 2 01:09:29 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit 'f950061' into next
Some specs were in conflict, as they had been recently modified to use
the API functionality that f950061 removes. This merge commit simply
restores the verson of those specs from f950061.
Manually Resolved Conflicts:
spec/unit/dsl/resource_type_api_spec.rb
commit 2e189d5166430b9ed37d9289a746b73e8673cab6
Merge: 4dbff92 8ff4b9a
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Sat Oct 2 00:33:31 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit '8ff4b9a' into next
There are merge conflicts with commits following this one.
commit 4dbff92f1cc1fa47167a4b4d8cf8ed9e4011cfc4
Merge: 3c34ea6 2b50f30
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Sat Oct 2 01:09:01 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit '2b50f30' into next
Commit 2b50f30 simplified and fixed bugs in code that had already been
modified extensively by 4da88fb and 6b1dd81. This merge resolution
commit is a manual replay of the changes from 2b50f30 onto next.
Manually Resolved Conflicts:
lib/puppet/parser/type_loader.rb
spec/unit/parser/type_loader_spec.rb
commit 3c34ea62687745156990f6d97460131b75e67c56
Merge: 9e66daa 7b8cb74
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Oct 1 23:01:27 2010 -0700
Partial merge to 2.6.2rc1 : Merge commit '7b8cb74' into next
There are merge conflicts with commits following this one.
commit 9e66daa27ce65028f48dd13c67e066d3cc2c766a
Merge: 9e72ccd cad1e0f
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Sep 13 23:34:06 2010 -0700
Merge commit '2.6.1' into next
commit 9e72ccd8ff087d0cf4a1396401e3843311b4e6d4
Merge: 1d93c4d efa834a
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Mon Sep 13 23:00:35 2010 -0700
Merge commit '2.6.1rc4' into next
commit 1d93c4dd86181eb2663dd8df2e84719c2e1ffcdf
Merge: 6860594 ce9bf1e
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Sep 9 16:29:26 2010 -0700
Merge remote branch 'paul/ticket/next/4685' into next
Conflicts resolved manually, by Paul Berry:
lib/puppet/parser/ast/astarray.rb
lib/puppet/parser/grammar.ra
lib/puppet/parser/parser.rb (by rebuilding from grammar.ra)
commit 6860594c4d95855d5106fbf664a473e1ac4d3935
Merge: f620957 df088c9
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Sep 9 16:20:26 2010 -0700
Merge remote branch 'paul/ticket/next/4638' into next
commit f62095749a14fd67987df5cf2e3e9138b71efd19
Merge: 4bda0b5 1ba536e
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Wed Sep 8 17:33:48 2010 -0700
Merge remote branch 'paul/ticket/next/3782' into next
commit 4bda0b53c7b30814a2c8f97455c9362b1de67f2a
Merge: fb90347 50fd9b7
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Wed Sep 8 16:17:58 2010 -0700
Merge remote branch 'paul/ticket/next/4570' into next
commit ce9bf1edcaac4901de6e0a7da413d1742d216eb0
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Sep 7 18:01:42 2010 -0700
Modified the error message that is generated when a class, definition,
or node occurs in a conditional construct so that it contains the
proper line number.
commit 6b278503021c4404904f56ced6995d0fbfa5b8fe
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Sep 2 18:10:37 2010 -0700
[#4657] Customer-supplied .rb files are not compatible with multiple environments or staleness check
Changed the resource type API to create AST objects rather than
directly instantiating resource types. This allows the same code
paths to be used to handle the results of parsing both .pp and .rb
files. This makes .rb files work properly in multiple environments,
because the types are now instantiated by code that is aware of which
environment the compilation is happening in. It also reduces the risk
of future changes breaking .rb file support.
Also, switched to using "instance_eval" rather than "require" to
evaluate the contents of the .rb file. This ensures that if the file
has to be recompiled (because it became stale), it will actually get
re-evaluated. As a side benefit, ResourceTypeAPI is now a class
rather than a mixin to Object, so its methods do not pollute the
global namespace.
To reduce the risk of customers coming to rely on implementation
details of the resource type API, changed its methods to return nil,
and removed methods from it that were misleadingly labeled as
"private".
commit 25048ecc40db746f7e88bb6c5e1fc4f2c0150a4f
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Sep 1 14:18:41 2010 -0700
[#4685] Classes, defines, and nodes allowed inside of non-evaluated conditionals
Previously, ASTArray#evaluate() was responsible for checking whether
the user had tried to declare a class, define, or node in a prohibited
location (such as a conditional construct). This meant that errors
would only be reported to the user if the conditional code was
actually evaluated.
Moved the checking into the parser, so that errors are always
reported.
commit 1ba536eb533e99d0f400178184ce929f18457b03
Author: Paul Berry <paul at puppetlabs.com>
Date: Tue Aug 31 11:46:36 2010 -0700
[3782] Test isolation problem in test/ral/providers/cron/crontab.rb
The test in question (test_parse_line) was nondeterministic because it
was relying on the sort order of a Hash whose keys were symbols. When
the sort order caused a blank line to appear at the end of the file
under test, the blank line was elided by the crontab parser, causing a
failure.
Modified the test to execute in a deterministic order that doesn't
place the blank line at the end.
commit fb9034731ddae41f1009745eb8eb1ea53aa05cfb
Merge: 16f701e 8be1929
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Fri Aug 27 12:33:15 2010 -0700
Merge commit '2.6.1rc3' into next
commit df088c9ba16dce50c17a79920c1ac186db67b9e9
Author: Paul Berry <paul at puppetlabs.com>
Date: Wed Aug 25 11:29:23 2010 -0700
[4638] Cleanup of plurals and inheritance relationships in AST
Changed the grammar so that the following "plural" constructs always
parse as an ASTArray:
- funcvalues
- rvalues
- resourceinstances
- anyparams
- params
- caseopts
- casevalues
And the following "singluar" construct never parses as an ASTArray:
- statement
The previous behavior was for these constructs to parse as a scalar
when they represented a single item and an ASTArray when they
contained zero or multiple items. ("Statement" could sometimes
represent a single item because a single resource declaration could
represent multiple resources). This complicated other grammar rules
and caused ambiguous handling of nested arrays.
Also made these changes to the AST class hierarchy:
- ResourceInstance no longer derives from ASTArray. This relationship
was not meaningful because a ResourceInstance is a (title,
parameters) pair, not an array, and it produced complications when
we wanted to represent an array of ResourceInstance objects.
- Resource no longer derives from ResourceReference. No significant
functionality was being inherited and the relationship doesn't make
sense in an AST context.
- ResourceOverride no longer derives from Resource. No significant
functionality was being inherited and the relationship doesn't make
sense in an AST context.
- Resource can now represent a compound resource instance such as
"notify { foo: ; bar: }". This saves the parser from having to
use represent a statement as an array of objects.
- ASTArray's evaluate method never flattens out arrays of arrays.
commit 50fd9b77cdb2346ec0b760364841abd4eb6f23ff
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Aug 19 09:40:15 2010 -0700
Fixed issue #4570 (Race conditions when serializing objects to YAML).
The ZAML class was using class variables to keep track of labels and
backreferences while serializing object to YAML. This made it
possible to get ill-formed or incorrect YAML output if two threads
tried to serialize objects at the same time.
Changed to use instance variables of the ZAML class, so there is no
race condition.
Also added some more spec tests to verify that labels are generated
properly.
commit 16f701edd89a320ad73b5468d883dfb017fe6e96
Merge: 3c090de 4da88fb
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Tue Aug 17 12:02:05 2010 -0700
Merge remote branch 'paul/4472-4483-4496-4521-4522'
a.k.a. "make_taller_trees"
commit 4da88fb4cd57871f16649d50572240ac3f7420f0
Author: Paul Berry <paul at puppetlabs.com>
Date: Fri Aug 13 15:43:34 2010 -0700
[#4496]+[#4521]+[#4522] Add structures to the AST to represent type definitions (classes, definitions, and nodes).
Previously, type definitions were not represented directly in the AST.
Instead, the parser would instantiate types and insert them into
known_resource_types as soon as they were parsed. This made it
difficult to distinguish which types had come from the file that was
just parsed and which types had been loaded previously, which led to
bug 4496.
A side-effect of this change is that the user is no longer allowed to
define types inside of conditional constructs (such as if/else). This
was allowed before but had unexpected semantics (bugs 4521 and 4522).
It is still possible, however, to place an "include" statement inside
a conditional construct, and have that "include" statement trigger the
autoloading of a file that instantiates types.
commit caca187dffbd6e628d7eda599c7f2939dd05fafc
Author: Paul Berry <paul at puppetlabs.com>
Date: Fri Aug 13 15:25:17 2010 -0700
Moved perform_initial_import from Puppet::Resource::TypeCollection to Puppet::Node::Environment.
This change is part of an ongoing effort to remove functionality from
TypeCollection that is not related to keeping track of a collection of
types. This reduces TypeCollection's linkage to the environment,
which is a step toward decoupling it from the type loading mechanism.
Also, added a spec test to verify that TypeCollection.version is
correctly recomputed when types are re-imported.
commit 3c090de39897d85a5d5be20254efcddea14ad8ad
Merge: 0f56c1b 6dbd477
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Thu Aug 12 14:19:14 2010 -0700
This is a bookkeeping merge that produces no code-change
It is meant to facilitate merging in a commit that was based upon
6dbd477, which was rebased into the 2.6.x branch as 449315a.
commit 6b1dd81799a44288287d9ab0cdf46afa3aaf090a
Author: Paul Berry <paul at puppetlabs.com>
Date: Thu Aug 5 10:34:35 2010 -0700
[#4472]+[#4483] Moved type-name resolution out of Puppet::Parser::TypeLoader.
Moved type-name resolution out of Puppet::Parser::TypeLoader, and into
its primary client, Puppet::Resource::TypeCollection. TypeCollection
now always passes fully qualified type names to TypeLoader.
This avoids duplicate type-name resolution logic between TypeLoader
and TypeCollection. That in turn fixes bug 4472, which resulted
from flaws in the type-name resolution logic in TypeLoader.
In addition, it fixes bug 4483, which resulted from improper
interleaving between looking up names using the TypeCollection and the
TypeLoader.
commit 6dbd4771265173a9d4c3e7756c35c9ca371ca394
Author: Jesse Wolfe <jes5199 at gmail.com>
Date: Wed Jul 28 14:54:23 2010 -0700
[#4397]+[#4344] Move type-name resolution out of Puppet::Resource into the AST resources.
Move type-name resolution out of Puppet::Resource into the AST resources.
Move find_resource_type out of Puppet::Resource into Scope
Thus, never pass unqualified type names to Puppet::Resource objects.
Thus, Puppet::Resource objects don't need the namespace property,
and Puppet::Resource objects never consult the harddrive to look for
.pp files that might contain their type definitions,
Thus, performance is improved.
Also removes the temporary fix for #4257 that caused #4397
(The code was too eager to look for a class in the topscope)
Paired-With: Paul Berry <paul at puppetlabs.com>
Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>
-----------------------------------------------------------------------
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list