summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* (4123) Fix test for 4123/4 on old egrep in cent4Dominic Maraglia2011-05-242-51/+36
| | | | | | | | Older versions of egrep do not support the character class "\s". Changed: puppet resource service | egrep -B1 "ensure\s*=>.*'running" to: puppet resource service | egrep -B1 "ensure.*=>.*'running"
* Merge branch '2.6.next' into 2.6.xPieter van de Bruggen2011-05-183-8/+8
|\
| * Merge branch 'ticket/2.6.next/3836' into 2.6.nextMax Martin2011-05-133-8/+8
|/| | | | | | | | | * ticket/2.6.next/3836: (#3836) External nodes should only capture stdout
| * (#3836) External nodes should only capture stdoutOliver Hookins2011-05-133-8/+8
|/ | | | This patch prevents stdout and stderr from being combined by Puppet::Util.execute, when used by Puppet::Indirector::Exec for external nodes.
* Merge branch '2.6.next' into 2.6.xDaniel Pittman2011-05-1229-103/+457
|\
| * adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| |
| * Merge branch 'ticket/2.6.next/7139' into 2.6.nextNick Lewis2011-05-032-1/+8
| |\
| | * (#7139) Accept '/' as a valid path in filesetsNick Lewis2011-05-032-1/+8
| |/ | | | | | | | | | | | | | | This was unconditionally removing the trailing file separator ('/'), which is only valid when the file separator isn't the entire path. This fixes 'puppet resource file <path>'. Paired-With: Jacob Helwig
| * Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into ↵Max Martin2011-04-283-1/+172
| |\ | | | | | | | | | | | | | | | | | | 2.6.next * toddz/feature/2.6.next/vim-indenting: vim: Initial ftplugin and indent support
| | * vim: Initial ftplugin and indent supportTodd Zullinger2011-04-023-1/+172
| | | | | | | | | | | | | | | Vim's indent support makes it easier to automatically indent puppet manifests.
| * | Merge branch 'ticket/2.6.next/6844' into 2.6.nextMax Martin2011-04-281-2/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/2.6.next/6844: case seems needless here as there is only two opts, also the rest of the file seems to use if so this should make things more consistant
| | * | case seems needless here as there is only two opts, also the rest of the ↵ben hengst2011-04-281-2/+1
| |/ / | | | | | | | | | file seems to use if so this should make things more consistant
| * | Merge branch 'ticket/2.6.x/6845' into 2.6.nextJames Turnbull2011-04-281-1/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/2.6.x/6845: (#6845) Mount writes incorrect vfstab entries
| | * | (#6845) Mount writes incorrect vfstab entriesStefan Schulte2011-04-281-1/+1
| |/ / | | | | | | | | | | | | Facter[:operatingsystem] will not retrieve the operatingsystem as a string so puppet will always write fstab entries.
| * | Merge branch 'ticket/2.6.next/6442-agent_doesnt_need_namespaceauth' into ↵Matt Robinson2011-04-272-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next * ticket/2.6.next/6442-agent_doesnt_need_namespaceauth: (#6442) Be able to start agents --listen without namespaceauth.conf
| | * | (#6442) Be able to start agents --listen without namespaceauth.confMatt Robinson2011-04-272-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The namespaceauth.conf isn't being used since we switched from XMLRPC to Rest. There's still a lot of cleanup of the code that deals with authorization from the namespaceauth.conf and XMLRPC in general, but that can be address later. For now just being able to start puppet agent in listen mode without a useless file will be a big win. You still need the auth.conf file though since that is used. Reviewed-by: Max Martin <max@puppetlabs.com>
| * | Merge branch 'tickets/2.6.next/3420' into 2.6.nextJosh Cooper2011-04-261-1/+9
| |\ \
| | * | (#3420) Nagios "name" attribute does not output correctlyJim Pirzyk2011-04-261-1/+9
| | | |
| * | | Merge branch 'tickets/2.6.next/4487' into 2.6.nextJosh Cooper2011-04-262-0/+15
| |\ \ \
| | * | | (#4487) When setting environment on a host, ensure it is a string.Josh Cooper2011-04-262-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change when environment strings were read out of the storeconfigs database, they were eventually converted up to Puppet::Node::Environment objects. When these objects are returned to the storeconfigs database, ActiveRecord dumps them as YAML, which begins the death-spiral of YAML. This change makes it so the host will always store the environment as a string, preventing the Puppet::Node::Environment object from being YAMLized, and stored as such in the database. This change was based on one by Richard Crowley. Paired-with: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com> Signed-off-by: Richard Crowley <r@rcrowley.org>
| * | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| | | | |
| * | | | Merge branch ↵Jacob Helwig2011-04-222-8/+71
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-future-OSX-versions' into 2.6.next * tickets/2.6.x/6487-help-directoryservice-provider-work-on-future-OSX-versions: (#6487) Add some testing for OS X version support in DirectoryService provider (#6487) Directoryservice provider will fail in future OS releases
| | * | | (#6487) Add some testing for OS X version support in DirectoryService providerJacob Helwig2011-04-221-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds some basic testing around whether url, or plist data is used for the various versions of OS X. Unfortunately this involves stubbing larger sections of the implementation than we'd like, but this did not attempt to re-structure the implementation at all. Paired-with: Josh Cooper <josh@puppetlabs.com>
| | * | | (#6487) Directoryservice provider will fail in future OS releasesGary Larizza2011-04-221-8/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes a case statement in the get_exec_pramble and single_report methods. In its place is an if statement that will cause Puppet to fail if its being run on an OS X system with a version < 10.4. This if-statement will also allow Puppet to run in 10.7. Signed-off-by: Gary Larizza <ccshots@gmail.com>
| * | | Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.nextJesse Wolfe2011-04-201-0/+2
| |\ \ \
| | * | | Maint: Fix a #4655 introduced log inconsistencyJesse Wolfe2011-04-201-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we moved code from the compiler to parser/resource, we lost a conditional that prevented defined resources from gaining containment edges to stages. Adding a stage to a defined resource was usually harmless, but it violated the invariant of "resources should only have exactly one container as their direct parent", producing a 50% chance of a malformed containment path in log messages. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| * | | Move acceptance tests from puppet-acceptance repoDominic Maraglia2011-04-2093-0/+2084
| | | |
| * | | Merge branch 'ticket/2.6.next/7166' into 2.6.nextJosh Cooper2011-04-206-20/+20
| |\ \ \
| | * | | Fixed #7166 - Replaced deprecated stomp "send" method with "publish"James Turnbull2011-04-206-20/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "send" method in the stomp gem has been deprecated since: http://gitorious.org/stomp/mainline/commit/d542a976028cb4c5badcbb69e3383e746721e44c It's been replaced with the "publish" method. Also renamed the send_message method to publish_message more in keeping with language used in queuing.
| * | | Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into ↵Jacob Helwig2011-04-198-67/+151
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next * tickets/2.6.x/4655-parameterized-classes-default-stages: (#4655) Allow stage to be set using a default class parameter Updated CHANGELOG for 2.6.8rc1
| | * | | (#4655) Allow stage to be set using a default class parameterJacob Helwig2011-04-196-66/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example: stage{ pre: before => Stage[main] } class someclass ($stage=pre ) { ... } class { someclass: } This transplants adding the edge from the resource to the stage from the compiler into when the resource is evaluated. This moves adding the stage edges to after when the defaults are copied into the resources, making them available. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.nextJames Turnbull2011-04-141-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * james/tickets/2.6.x/6681: Fixed #6681 - Remove --force-yes option from aptitude is used
| | * | | | Fixed #6681 - Remove --force-yes option from aptitude is usedJames Turnbull2011-03-121-0/+1
| | | |/ / | | |/| |
* | | | | Update CHANGELOG for 2.6.8Jacob Helwig2011-04-271-2/+5
| | | | |
* | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| | | | |
* | | | | Move tests from puppet-acceptance repoDominic Maraglia2011-04-2092-0/+2045
| |_|/ / |/| | |
* | | | Updated CHANGELOG for 2.6.8rc1Max Martin2011-04-132-1/+47
| | | |
* | | | Merge branch '2.6.next' into 2.6.xMax Martin2011-04-1312-101/+292
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (#2331) Remove darwinports pkg provider, replace with rewritten macports provider Fixed #7082 - Added system support for groups (#7018) Give more context on the service type's assumptions. Wording tweaks. (#7018) explain internals better in service provider documentation maint: Fix sqlite3 require to really be optional maint: Fix sporadic sqlite error (#6818) Stop from getting Rails 3 named_scope deprecation warning (#6856) Copy dangling symlinks with 'links => manage' File resource.
| * | | Merge branch 'ticket/2.6.x/7082' into 2.6.nextNick Lewis2011-04-134-3/+33
| |\ \ \
| | * | | Fixed #7082 - Added system support for groupsJames Turnbull2011-04-144-3/+33
| |/ / / |/| | |
| * | | Merge branch 'tickets/2.6.x/2331-macports-provider' into 2.6.nextNigel Kersten2011-04-133-86/+228
| |\ \ \
| | * | | (#2331) Remove darwinports pkg provider, replace with rewritten macports ↵Nigel Kersten2011-04-133-86/+228
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provider * Employs port -q installed, much faster than port list installed * Handles upgrades correctly now * Makes use of internal port revision for ensure => latest upgrades * Versionable, now works with ensure => specified_version * Does not handle port variants at all yet. * Does not allow manual specification of revision, only version * Test coverage expanded using newer syntax Paired-With: Daniel Pittman
| * | | Merge branch 'ticket/2.6.next/7018-clarify_service_type_behavior' into 2.6.nextnfagerlund2011-04-111-11/+19
| |\ \ \
| | * | | (#7018) Give more context on the service type's assumptions. Wording tweaks.nfagerlund2011-04-111-14/+19
| | | | | | | | | | | | | | | | | | | | Refactoring the @doc string for clarity.
| | * | | (#7018) explain internals better in service provider documentationBen Hughes2011-04-111-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit reasoning for hasstatus in the documentation with certain "virtual" services. Just to clear up why notify => Service["something_virtual"] requires hasstatus defining for it to function.
| * | | Merge branch 'ticket/2.6.next/maint-fix_sqlite_test' into 2.6.nextMatt Robinson2011-04-111-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/maint-fix_sqlite_test: maint: Fix sqlite3 require to really be optional maint: Fix sporadic sqlite error
| | * | | maint: Fix sqlite3 require to really be optionalMatt Robinson2011-04-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You need to specifically rescue LoadError if you want requires to be optional. Paired-with: Nick Lewis
| | * | | maint: Fix sporadic sqlite errorMatt Robinson2011-04-111-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::StatementInvalid: SQLite3::IOException: disk I/O error This happened if you ran these tests in the following order since Rails wasn't disconnecting between tests. rspec spec/unit/indirector/facts/inventory_active_record_spec.rb spec/unit/indirector/node/active_record_spec.rb Paired-with: Nick Lewis <nick@puppetlabs.com>
| * | | Merge branch 'ticket/2.6.next/6818-named_scope_deprecation' into 2.6.nextMatt Robinson2011-04-111-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6818-named_scope_deprecation: (#6818) Stop from getting Rails 3 named_scope deprecation warning
| | * | | (#6818) Stop from getting Rails 3 named_scope deprecation warningMatt Robinson2011-04-111-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want our Rails models in Puppet to work under Rails 2 or 3, but we don't want the deprecation warnings since we can't control what version of Rails the client is running. DEPRECATION WARNING: Base.named_scope has been deprecated, please use Base.scope instead Reviewed-by: Nick Lewis <nick@puppetlabs.com>
generated by cgit (git 2.34.1) at 2025-09-26 20:01:41 +0000