summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Bookkeeping: Merge commit '9e2a0e4' into nextJesse Wolfe2010-11-040-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | This synchronizes merge commits between master and next.
| * | | | Merge commit '85543a4'Jesse Wolfe2010-11-0349-2290/+2346
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | This updates `master` to the pre-agile-iteration state.
| * | | | Merge commit '2.6.3rc1'Jesse Wolfe2010-10-189-25/+87
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge commit '2.6.2'Jesse Wolfe2010-10-124-4/+11
| |\ \ \ \
| * \ \ \ \ Merge commit '2.6.2rc1'Jesse Wolfe2010-10-0179-638/+1229
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '2.6.1'Jesse Wolfe2010-09-137-11/+48
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit '2.6.1rc4'Jesse Wolfe2010-09-1347-2795/+3353
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit '2.6.1rc3'Jesse Wolfe2010-08-2719-84/+141
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This synchronizes the 2.7 master branch with 2.6.1RC3 The 2.7 next branch has now diverged from master for the first time, as if contains code that has not reached "release quality" status.
| * \ \ \ \ \ \ \ \ Merge branch 'next'Jesse Wolfe2010-08-12167-1202/+1059
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This synchronizes the 2.7 master branch with 2.6.1RC2
| * \ \ \ \ \ \ \ \ \ Merge branch 'next'Jesse Wolfe2010-07-2742-157/+903
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This synchronizes the 2.7 master branch with 2.6.1RC1
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'maint/next/remove-request-object-from-rest-api' into nextJesse Wolfe2010-11-0214-1108/+95
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Maint: Remove Indirector::Request objects from HTTP Handler and API V1Jesse Wolfe2010-11-0214-1108/+95
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | Merge branch 'ticket/next/5166' into nextPaul Berry2010-11-012-37/+162
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | (#5166) Inventory service is now searchable by timestamp.Paul Berry2010-11-012-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding ↵Paul Berry2010-11-011-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | freshness check
| * | | | | | | | | | | | Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshnessPaul Berry2010-11-011-17/+29
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ticket/next/5164' into nextJesse Wolfe2010-11-013-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix #5164 Change Facts timestamp when they are received by the masterJesse Wolfe2010-11-013-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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@puppetlabs.com>
| * | | | | | | | | | | | Maint: Don't use a stub for a Facts object in the compiler specsJesse Wolfe2010-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The catalog compiler spec was overstubbing the Node::Facts object, making it hard to test the interaction between those two systems.
| * | | | | | | | | | | | Maint: spec/unit/indirector/catalog/compiler_spec.rb wouldn't run by itselfJesse Wolfe2010-11-011-0/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require puppet/rails so we can run this test alone.
* | | | | | | | | | | | Merge branch 'ticket/next/4894' into nextMatt Robinson2010-10-282-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/4894: [#4894] Randomize port on webrick tests
| * | | | | | | | | | | | [#4894] Randomize port on webrick testsMatt Robinson2010-10-282-7/+15
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge branch 'ticket/next/5132' into nextMatt Robinson2010-10-2812-10/+211
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/5132: (#5132) Provide a query REST interface for inventory
| * | | | | | | | | | | | (#5132) Provide a query REST interface for inventoryMatt Robinson2010-10-2812-10/+211
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | Merge branch 'feature/next/5148-fix' into nextNick Lewis2010-10-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | (#5148) Fix failing spec due to timezoneNick Lewis2010-10-281-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | Merge branch 'feature/next/5148' into nextNick Lewis2010-10-282-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | (#5148) Add support for PSON to factsNick Lewis2010-10-282-0/+45
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Merge remote branch 'nigel/tickets/2.6.x/4382' into nextJesse Wolfe2010-10-181-1/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make --mkusers work on OS X, we now find unused uid/gids if unspecifiedNigel Kersten2010-10-111-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like other platforms.
* | | | | | | | | | | | Merge commit '2.6.3rc1' into nextJesse Wolfe2010-10-189-25/+87
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Updated CHANGELOG and version for 2.6.3rc1James Turnbull2010-10-142-1/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Fix for #4832 -- Making PSON handle arbitrary binary dataMarkus Roberts2010-10-132-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PSON library needlessly assumed that the data to be transmitted was well- formed unicode. This made Latin-1 users (and anyone who needed to serialize arbitrary binary data) sad. This patch goes some of the way to resolving the issues, by passing through non-unicode data rather than just failing, adds tests, and cleans up a pernicious assumption about escape characters in ruby regular expressions not marked "n" (no-encoding).
| * | | | | | | | | | | Minimal fix for #4975 -- only call chage when managing password age rulesMarkus Roberts2010-10-134-8/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended to be a minimal fix, with tests, to prevent chage from running unless needed.
| * | | | | | | | | | | Fix for #4963 -- Use correct commands for password expiry on solarisMarkus Roberts2010-10-132-4/+4
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the command / option issues of #4963 as suggested on the ticket; the setting-expiry when not needed aspects are deferred to #4975.
* | | | | | | | | | | Merge commit '2.6.2' into nextJesse Wolfe2010-10-124-4/+11
|\| | | | | | | | | |
| * | | | | | | | | | Updated CHANGELOG for 2.6.2James Turnbull2010-10-081-0/+8
| | | | | | | | | | |
| * | | | | | | | | | Fix for #4945 -- explicitly check os to supress man page installationMarkus Roberts2010-10-061-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for #4644 usurped an existing option flag to supress the installation of man pages on Microsoft Windows, when the desired behaviour was to only skip the installation on MSWin and not change the behaviour on other platforms. This patch implements the check explicitly to correctly express the desired behaviour.
| * | | | | | | | | Reversion of 021d534482dd8edb863cb77d668ac3525362a0a6Markus Roberts2010-10-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix for #3707 was incorrect & just moved the problem (see #4929).
| * | | | | | | | | Fixed #4919 - added parenths to fix error message:James Turnbull2010-10-021-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | /usr/lib/ruby/site_ruby/1.8/puppet/util/metric.rb:62: warning: parenthesize argument(s) for future version
* | | | | | | | | Merge remote branch 'paul/ticket/next/4657' into nextJesse Wolfe2010-10-056-74/+62
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | [#4657] Customer-supplied .rb files are not compatible with multiple ↵Paul Berry2010-09-029-62/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
* | | | | | | | | | Merge commit '2.6.2rc1' into nextJesse Wolfe2010-10-0431-282/+597
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Incremented version to 2.6.2James Turnbull2010-10-011-1/+1
| | | | | | | | | |
| * | | | | | | | | Updated CHANGELOG for 2.6.2rc1James Turnbull2010-10-011-195/+43
| | | | | | | | | |
| * | | | | | | | | Fixed documentation typoJames Turnbull2010-10-011-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix for #4896 -- stray newline left over from removed diagnosticMarkus Roberts2010-09-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A newline that was part of a diagnostic was left in, and this caused problems with the serialization of strings in "preserve newlines" mode.
| * | | | | | | | | (#4772) Update SuSE .spec fileJacob Helwig2010-09-302-27/+13
| | | | | | | | | |
| * | | | | | | | | Fixes #4792 (Duplicate definition since 2.6.1 upgrade)Paul Berry2010-09-302-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The evaluate_definitions method was first figuring out which resources needed to be evaluated (using unevaluated_resources), and then evaluating them one by one. As a result, if evaluating one resource triggered another resource to be evaluated, the latter resource could get evaluated twice. This bug could occur, for example, if both resources were classes that were included into the node by an external node classifier, and if the first of the two classes included the second. Modified Resource#evaluate to be idempotent. Also added an integration test to verify the fix.
| * | | | | | | | | Improvement to #4025: made spec tests work on all platformsPaul Berry2010-09-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec test changes for ticket 4025 (binary plist support) failed on non-OSX systems because of a missing stub. Added the missing stub so that the spec tests can now run on all systems.