summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'maint/next/add_local_branch_to_mail_patches' into nextPaul Berry2010-11-091-1/+12
| |\ \ \ \ \ \
| | * | | | | | Maint: Add "Local-branch:" info to mails sent by "rake mail_patches"Paul Berry2010-11-091-1/+12
| |/ / / / / /
| * | | | | | Merge branch 'maint/next/clean_up_agent_spec' into nextPaul Berry2010-11-091-20/+21
| |\ \ \ \ \ \
| | * | | | | | Maint: remove unnecessary stubbing from agent_specPaul Berry2010-11-091-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Merge branch 'maint/next/missing_fileserver_requires' into nextPaul Berry2010-11-091-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Maint: Added missing requires to fileserver.rb.Paul Berry2010-11-091-0/+2
| |/ / / / / /
| * | | | | | Merge branch 'maint/next/forkbomb' into nextJesse Wolfe2010-11-091-0/+8
| |\ \ \ \ \ \
| | * | | | | | maint: prevent fork bombs by disabling ActiveSupport's Kernel.daemonizeJesse Wolfe2010-11-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Merge branch 'feature/next/cert_inspector' into nextJesse Wolfe2010-11-081-0/+140
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | maint: First draft of cert inspectorPaul Berry2010-11-081-0/+140
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Bookkeeping: Merge commit '9e2a0e4' into nextJesse Wolfe2010-11-040-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | This synchronizes merge commits between master and next.
* | | | | | | Merge branch 'next'Jesse Wolfe2010-11-0326-1113/+495
|\| | | | | | | |/ / / / / |/| | | | | | | | | | | This marks the end of our first agile iteration.
| * | | | | 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 commit '85543a4'Jesse Wolfe2010-11-0349-2290/+2346
|\| | | | | | |_|/ / / |/| | | | | | | | | This updates `master` to the pre-agile-iteration state.
| * | | | 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
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge commit '2.6.2' into nextJesse Wolfe2010-10-124-4/+11
| |\ \ \ \ \
| * \ \ \ \ \ 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '574812e' into nextJesse Wolfe2010-10-043-24/+33
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '021359b' into nextJesse Wolfe2010-10-041-13/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are test failures and merge conflicts in commits following this one.
| * \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commits 'd057b90' and '6dd1930' into nextJesse Wolfe2010-10-045-21/+51
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit merges in d057b90 with the addition of commit 6dd1930 to fix some tests that are confined to machines where rrd is installed.
| | * | | | | | | | | | Fix test failures that fixing #4726 exposed.Jesse Wolfe2010-10-043-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into nextJesse Wolfe2010-10-0417-156/+202
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are test failures in commits following this one.
| * \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '99c1019' into nextJesse Wolfe2010-10-043-16/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '8cd1540' into nextJesse Wolfe2010-10-026-9/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are merge conflicts with commits following this one.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit 'f950061' into nextJesse Wolfe2010-10-026-41/+186
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '8ff4b9a' into nextJesse Wolfe2010-10-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are merge conflicts with commits following this one.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '2b50f30' into nextJesse Wolfe2010-10-024-74/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '7b8cb74' into nextJesse Wolfe2010-10-0211-40/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are merge conflicts with commits following this one.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '2.6.1' into nextJesse Wolfe2010-09-137-11/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit (git 2.34.1) at 2025-10-01 00:35:42 +0000