summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigsJacob Helwig2011-03-152-18/+43
| | | | | | | | | | | | | | | | | The Puppet::Resource::Reference class wasn't stubbing enough of the 0.25.x behavior to satisfy the needs of storedconfigs. Since P::R::Reference, and Puppet::Resource were merged as part of 2.6.x, we can pretend that P::Resource is P::R::Reference for the purposes of loading data from storedconfigs. This should still satisfy the over-the-wire serialization needs of 0.25.x. This also changes internal references to @parameters in Puppet::Resource(::Reference) to go through a parameters method. This allows us to "initialize" this instance variable lazily, since loading via YAML bypasses the normal initialize method. Paired-with: Daniel Pittman <daniel@puppetlabs.com> Reviewed-by: Markus Roberts <markus@puppetlabs.com>
* Updated CHANGELOG for 2.6.5rc5Jacob Helwig2011-02-211-0/+7
|
* Merge branch 'ticket/2.6.x/6337' into 2.6.xPaul Berry2011-02-211-1/+1
|\ | | | | | | | | * ticket/2.6.x/6337: (#6337) Fix Ruby warning on 1.8.6 about "future compatibility"
| * (#6337) Fix Ruby warning on 1.8.6 about "future compatibility"Daniel Pittman2011-02-211-1/+1
|/ | | | | | | | | | | Ruby 1.8.6 (but not later versions) warn about requiring parenthesis on some function calls; having one of those in our network rights checking means that we emit ... quite a few of these, and annoy anything that tracks our logs. By using the more standard form of raise we can avoid the warning entirely, and keep consistent code style across the file. Reviewed-By: Paul Berry <paul@puppetlabs.com>
* Merge branch 'ticket/2.6.x/6353' into 2.6.xPaul Berry2011-02-215-61/+145
|\ | | | | | | | | * ticket/2.6.x/6353: (#6353) Restore the ability to store paths in the filebucket
| * (#6353) Restore the ability to store paths in the filebucketPaul Berry2011-02-215-61/+145
|/ | | | | | | | | | | | | Commit 2274d5104f6e413a2b8899a3c3111a17bbb2f4d7 optimized network usage for the case where a file is already in the filebucket. However, it took away the ability to store paths. This change restores the ability to store paths while maintaining optimal network usage for the case where the file is already in the filebucket with the given path. This is expected to be the most common case. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
* Merge branch 'bug/2.6.x/6126-puppet-inspect-has-no-status-messages' into 2.6.xDaniel Pittman2011-02-182-58/+60
|\
| * (#6126) Puppet inspect now reports status after run completes.Daniel Pittman2011-02-182-58/+60
|/ | | | | | | | We now emit timing and output a status message at the end of a successful inspect run. Paired-With: Nick Lewis <nick@puppetlabs.com> Signed-Off-By: Daniel Pittman <daniel@puppetlabs.com>
* Merge branch 'tickets/2.6.x/6364-fix-mount-provider-on-aix' into 2.6.xJacob Helwig2011-02-182-8/+8
|\ | | | | | | | | * tickets/2.6.x/6364-fix-mount-provider-on-aix: (#6364) Adjust mis-translated regex in mount provider for AIX
| * (#6364) Adjust mis-translated regex in mount provider for AIXJacob Helwig2011-02-182-8/+8
|/ | | | | | | | | | | | | | | | | | | The commit to simplify the regex used to parse the output from the mount command on AIX (50c12e55b6f8462f6904ae061e661d1d10c7590a) mis-translated it. The original regex was grabbing the 3rd space-separated element, not the 2nd. This mis-translation caused the provider to grab the device information instead of the mount point, and compare that to the desired mount point. This would cause Puppet to think that the mount was never actually mounted under normal circumstances. The code from 50c12e5 was passing the tests because the fixture data did not include the mandatory leading whitespace that the original regex was looking for. The updated fixture data is pulled from the mount manpage from AIX v6r1. Reviewed-by: Paul Berry <paul@puppetlabs.com>
* Updated CHANGELOG for 2.6.5rc4Jacob Helwig2011-02-141-0/+4
|
* Merge branch 'tickets/2.6.x/3646-fix-documentation-fix-fix' into 2.6.xJacob Helwig2011-02-142-6/+5
|\ | | | | | | | | * tickets/2.6.x/3646-fix-documentation-fix-fix: (#3646) Fix the documentation fix for `puppet apply --apply`
| * (#3646) Fix the documentation fix for `puppet apply --apply`Jacob Helwig2011-02-142-6/+5
|/ | | | | | | --apply is actually off of `puppet apply`, not off of `puppet agent` (nor `puppet master`), so move the documentation accordingly. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
* Updated CHANGELOG for 2.6.5rc3Jacob Helwig2011-02-141-0/+5
|
* Updated fix for #3646 - apply / compile documentationJames Turnbull2011-02-142-8/+9
|
* (#5977) fix spec test failure when new applications are introduced.Daniel Pittman2011-02-141-4/+9
| | | | | | | | | | | The test here was previously fragile, in that it would break when new applications were introduced, and in that it depended on the order of items returned from reading the directories on disk. It is now insensitive to those changes, and still verifies that the results we require occur, reducing long term maintenance cost. Reviewed-by: James Turnbull <james@puppetlabs.com>
* Updated CHANGELOG for 2.6.5rc2Jacob Helwig2011-02-081-0/+5
|
* Merge remote branch 'dan/ticket/2.6.4/5977' into 2.6.nextJesse Wolfe2011-02-082-2/+30
|\
| * (5977) Puppet::Applications can be loaded from multiple paths.Dan Bode2011-01-142-2/+30
| | | | | | | | | | | | | | - previously, Puppet would search $LOAD_PATH and just load applications in the first $LOAD_PATH to have the directory puppet/application. Now multiple paths can contain applications.
* | Merge branch 'ticket/2.6.next/6257' into 2.6.nextJesse Wolfe2011-02-081-3/+1
|\ \
| * | (#6257) Speed up PUT and POST requests under rackJesse Wolfe2011-02-081-3/+1
|/ / | | | | | | | | | | | | This patch significantly speeds up reading the body of HTTP requests from Rack. Reviewed-by: Markus Roberts <markus@puppetlabs.com>
* | Updated CHANGELOG and version for 2.6.5rc1Nick Lewis2011-02-032-1/+128
| |
* | Merge branch '2.6.next' into 2.6.xJacob Helwig2011-02-0310-10/+160
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (#6018) Nick F's --help text for puppet inspect. (#5823) document the not-an-API status of set_run_mode (#5823) run mode can now be set dynamically... (6114) Update the audit metaparameter for 2.6.5. Fix for #5755 -- making zaml serialization robust over projected objects (#4139) hook log autoflush into global defaults
| * \ Merge branch 'bug/2.6.next/5755-gc-issue' into 2.6.nextPaul Berry2011-02-031-0/+2
| |\ \ | | | | | | | | | | | | | | | | * bug/2.6.next/5755-gc-issue: Fix for #5755 -- making zaml serialization robust over projected objects
| | * | Fix for #5755 -- making zaml serialization robust over projected objectsMarkus Roberts2011-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core problem arose when the fix for #5048 in 31118fe85aca4 introduced a hook to replace objects dynamically durring serialization so that they could be projected / rewritten to a different form for backward compatability. The serialization code assumed that all objects being serialized would remain valid until the serialization was complete, but nothing retained a copy of the temporary objects created in the hook. To resolve this, the serialization layer now maintains a ref to each such object and clears them (to allow GC) after serialization is complete. Paired-with: Jesse Wolfe <jesse@puppetlabs.com> Paired-with: Paul Berry <paul@puppetlabs.com>
| * | | Merge branch 'docs/2.6.next/inspect-help' into 2.6.nextJesse Wolfe2011-02-031-0/+53
| |\ \ \
| | * | | (#6018) Nick F's --help text for puppet inspect.Jesse Wolfe2011-02-031-0/+53
| | | | |
| * | | | Merge branch 'bug/2.6.next/5823-allow-run-mode-to-cut-your-hand-off' into ↵Daniel Pittman2011-02-031-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 2.6.next
| | * | | | (#5823) document the not-an-API status of set_run_modeDaniel Pittman2011-02-031-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is totally not API, document that in big, threatening letters so that folks actually know what is going on. Include promises so they don't feel too unhappy with us. Paired-with: matt@puppetlabs.com
| * | | | Merge branch 'bug/2.6.next/5823-allow-run-mode-to-cut-your-hand-off' into ↵Daniel Pittman2011-02-032-3/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 2.6.next
| | * | | | (#5823) run mode can now be set dynamically...Daniel Pittman2011-02-032-3/+48
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Third party scripts, and complex command line tools, depend on being able to configure the run_mode value at runtime, not just when they fire up. For better or worse we used to allow this sort of thing to work, but stopped, and we have no sane, safe and consensual alternative, so we broke a bunch of client code. This enables the feature again, but does not add any safety catch; you can now happily slice off your own feet with this, if you really want to.
| * | | | Merge branch 'ticket/2.6.next/6114' into 2.6.nextnfagerlund2011-02-031-6/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | (6114) Update the audit metaparameter for 2.6.5.nfagerlund2011-02-031-6/+19
| |/ / / | | | | | | | | | | | | The audit metaparameter has some new behavior, its old behavior has changed, and the previous description was incomplete at any rate. This patch replaces its description string.
| * | | Merge branch 'bug/2.6.next/4139-autoflush-doesn't' into 2.6.nextDaniel Pittman2011-02-035-1/+31
|/| | |
| * | | (#4139) hook log autoflush into global defaultsDaniel Pittman2011-02-035-1/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously had an ordering dependency in the autoflush option, which was statically read from defaults when the log destination was configured. We add a hook in the defaults to update the log subsystem, which in turn updates log destinations, when autoflush is changed. This would work as desired: puppet agent --autoflush --logdest=file This would not work, as autoflush would be false: puppet agent --logdest=file --autoflush Now those changes propagate correctly. Paired-with: matt@puppetlabs.com
* | | Merge branch '2.6.next' into 2.6.xMatt Robinson2011-02-0268-298/+844
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (46 commits) Augmentation of tests for prior commit Fix to fix for #5755 -- backref serialization issues in zaml Fixed #5564 - Added some more fqdn_rand documentation Fixed #4968 - Updated list of options turned on by --test in documentation (#5061) - allow special hostclass/define variables to be evaluated as defaults. (#6107) Fix an error when auditing a file with empty content Remove already initialized constant warning from file_spec.rb tests (#5566) Treat source only File checksums as syntax errors when used with content Rename variable used in File type validation to be more clear Remove invalid "timestamp" and "time", and add missing "ctime" File checksum types. Remove order dependency when specifying source and checksum on File type Bug #5755 -- ZAML generates extra newline in some hash backreferences. bug #5681 -- code fix to handle AIX mount output Bug #5681 -- parse AIX mount command output. Spec for #5681 to allow parsing of AIX mount output in mount provider Fixed #6091 - Changed POSIX path matching to allow multiple leading slashes Bug #6091 -- test leading double-slash in filenames are allowed. Fixed #6071 - Fixed typo and improved exec path error message Fixed #6061 - Allowed -1 as password min/max age Bug #6061 -- verify that negative {min,max}_password_age are accepted. ...
| * | Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.nextMarkus Roberts2011-02-0116-39/+74
| |\ \
| | * \ Merge remote branch 'bodepd/feature/2.6.4/5910' into 2.6.nextPaul Berry2011-02-012-2/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | * bodepd/feature/2.6.4/5910: (#5910) Improved logging when declared classes cannot be found:
| | | * | (#5910) Improved logging when declared classes cannot be found:Dan Bode2011-01-122-2/+15
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when a class could not be found, it was displaying the same error message as when a resource type could not be found. This resulted in confusing error message: Invalid resource type class, when really it should display the name of the class that could not be found. My patch changes the error message to: Could not find declared class #{title}
| | * | Merge branch 'ticket/2.6.x/5913' of git://github.com/mitchellh/puppet into ↵Jacob Helwig2011-02-012-2/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next * 'ticket/2.6.x/5913' of git://github.com/mitchellh/puppet: (#5913) Fix Puppet::Application.find constant lookup behavior
| | | * | (#5913) Fix Puppet::Application.find constant lookup behaviorMitchell Hashimoto2011-01-162-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Puppet::Application.find now only looks in the Puppet::Application namespace for the given constant.
| | * | | Merge remote branch 'james/tickets/2.6.x/5916' into 2.6.nextJesse Wolfe2011-02-015-20/+8
| | |\ \ \
| | | * | | Fixes #5916 - Cleanup of unused doc methods and documentationJames Turnbull2011-01-175-20/+8
| | | |/ /
| | * | | Merge remote branch 'james/tickets/2.6.x/5914' into 2.6.nextJesse Wolfe2011-02-011-1/+1
| | |\ \ \
| | | * | | Fixed #5914 Removed genconfig = true from genconfig outputJames Turnbull2011-01-201-1/+1
| | | |/ /
| | * | | Merge remote branch 'jamtur01/tickets/2.6.x/6071' into 2.6.nextJacob Helwig2011-02-011-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jamtur01/tickets/2.6.x/6071: Fixed #6071 - Fixed typo and improved exec path error message
| | | * | | Fixed #6071 - Fixed typo and improved exec path error messageJames Turnbull2011-01-301-2/+2
| |_|/ / / |/| | | |
| | * | | Merge branch 'tickets/2.6.x/5564' into 2.6.nextPaul Berry2011-02-011-3/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/5564: Fixed #5564 - Added some more fqdn_rand documentation
| | | * | | Fixed #5564 - Added some more fqdn_rand documentationJames Turnbull2011-02-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Paul Berry <paul@puppetlabs.com>
| | * | | | Merge remote branch 'james/tickets/2.6.x/6002' into 2.6.nextJesse Wolfe2011-02-011-0/+4
| | |\ \ \ \