summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | (#7137) Get rid of spurious info messages in useraddMax Martin2011-04-251-2/+0
| | | |/ / / / /
| | | * | | | | Fix test ticket_6928_puppet_master_parse_failsDominic Maraglia2011-04-251-7/+4
| | | * | | | | maint: add the 'to', 'not_to', and 'to_not' aliases to rspec...Daniel Pittman2011-04-241-0/+12
| | | * | | | | Merge branch 'feature/2.7.x/7157-automatic-non-zero-exit-codes' into 2.7.xDaniel Pittman2011-04-2236-203/+234
| | | |\ \ \ \ \
| | | | * | | | | (#7157) Return a non-zero exit code on face failure.Daniel Pittman2011-04-223-12/+79
| | | | * | | | | maint: use the exit_with helper everywhere...Daniel Pittman2011-04-2218-190/+90
| | | | * | | | | maint: add an "exit was called" matcher for rspec.Daniel Pittman2011-04-221-0/+22
| | | | * | | | | maint: clean up test headers on face spec files.Daniel Pittman2011-04-2215-1/+43
| | | |/ / / / /
| | | * | | | | Merge branch 'ticket/2.7.x/7080-reverts' into 2.7.xMax Martin2011-04-216-266/+16
| | | |\ \ \ \ \
| | | | * | | | | Revert "Fixing Facts pson methods more resilient"Max Martin2011-04-212-36/+14
| | | | * | | | | Revert "(7080) Adding json support to Indirector Request"Max Martin2011-04-212-144/+2
| | | | * | | | | Revert "Adding json support to Puppet::Node"Max Martin2011-04-212-86/+0
| | | * | | | | | Merge branch 'ticket/2.7.x/7084' into 2.7.xJesse Wolfe2011-04-215-18/+41
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix #7084 Make the log messages produced by whits less confusingJesse Wolfe2011-04-215-18/+41
| | | * | | | | | | Merge branch 'bug/2.7.x/7121-the-'configurer'-face-should-download-plugins-an...Daniel Pittman2011-04-212-3/+24
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | (#7121) Download plugins and upload reports in secret agent!Daniel Pittman2011-04-212-3/+24
| | | * | | | | | | | maint: fix a race in catalog compilation versioning.Daniel Pittman2011-04-211-0/+7
| | | |/ / / / / / /
| | | * | | | | | | Merge remote-tracking branch 'remotes/lak/tickets/next/7118-summaries_for_all...Daniel Pittman2011-04-2118-17/+67
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | (7118) Adding summaries for all facesLuke Kanies2011-04-1418-18/+69
| | | * | | | | | | | Merge branch 'feature/2.7.x/7181-rename-configurer-face' into 2.7.xDaniel Pittman2011-04-214-9/+7
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | | * | | | | | | (#7181) Rename configurer face to secret_agent.Daniel Pittman2011-04-214-9/+7
| | | |/ / / / / / /
| * | | | | | | | | Merge branch 'tickets/next/7481' into nextJames Turnbull2011-05-123-0/+78
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed #7481 - Added MIT license to Thomas Bellman's function codeJames Turnbull2011-05-123-0/+78
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'ticket/next/7264-metaparameter_reference' into nextnfagerlund2011-05-111-40/+44
|/| | | | | | | | |
| * | | | | | | | | (#7264) Docs: Clarify that subscribe/notify imply require/beforenfagerlund2011-05-111-40/+44
|/ / / / / / / / /
* | | | | | | | | Merge branch 'next'Max Martin2011-04-2711-11/+285
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Merge branch '2.7.next' into nextMax Martin2011-04-2711-11/+285
| |\| | | | | | | |
| | * | | | | | | | Merge branch '2.6.next' into 2.7.nextMax Martin2011-04-276-9/+120
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | 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
| | | * | | | | | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| | | * | | | | | | | | Merge branch 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-futur...Jacob Helwig2011-04-222-8/+71
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | (#6487) Add some testing for OS X version support in DirectoryService providerJacob Helwig2011-04-221-0/+60
| | | | * | | | | | | | (#6487) Directoryservice provider will fail in future OS releasesGary Larizza2011-04-221-8/+11
| | | |/ / / / / / / /
| | * | | | | | | | | Merge branch 'tickets/2.7.next/7220' into 2.7.nextPieter van de Bruggen2011-04-254-0/+125
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | (#7220) Add the ability to "inherit" options.Pieter van de Bruggen2011-04-254-0/+125
| | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'tickets/2.7.next/6368-files-autorequire-nearest-ancestor-direct...Jacob Helwig2011-04-222-2/+65
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | (#6368) Make the File type autorequire its nearest ancestor directoryIan Ward Comfort2011-04-222-2/+65
| * | | | | | | | | | | Merge branch 'ticket/next/7101-template-compilation' into nextMax Martin2011-04-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | (#7101) Fix template error messages in Ruby 1.8.5Max Martin2011-04-271-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
* | | | | | | | | | | | Merge branch 'ticket/master/7101-template-compilation'Max Martin2011-04-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | (#7101) Fix template error messages in Ruby 1.8.5Max Martin2011-04-271-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
* | | | | | | | | | | | Merge branch 'next'Max Martin2011-04-2126-316/+387
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch '2.7.next' into nextMax Martin2011-04-2126-316/+387
|/| | | | | | | | | | | | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '2.7.x' into 2.7.nextMax Martin2011-04-2130-316/+532
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'bug/2.7.x/6928-backport-symbol-to_proc' into 2.7.xDaniel Pittman2011-04-211-6/+4
| | |\ \ \ \ \ \ \ \ \