summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | (#7304) Remove full puppet help output when subcommand cannot be foundNigel Kersten2011-05-041-6/+1
|/ /
* | adding test for ticket 7117Dominic Maraglia2011-05-041-3/+5
* | Merge branch 'bug/2.7.x/7353-unify-face-rendering-with-network-formathandler'...Daniel Pittman2011-05-048-52/+141
|\ \
| * | (#7353) Note the :for_humans compatibility issue.Daniel Pittman2011-05-042-0/+4
| * | (#7353) Use :console rendering format in our own code.Daniel Pittman2011-05-042-2/+2
| * | (#7353) Unify rendering in the face_bace application.Daniel Pittman2011-05-042-50/+37
| * | (#7353) Add 'console' format to FormatHandlerDaniel Pittman2011-05-042-0/+98
* | | Merge branch '2.7.x' of github.com:puppetlabs/puppet into 2.7.xDominic Maraglia2011-05-0317-24/+93
|\| |
| * | Merge branch 'bug/2.7.x/7277-improve-secret-agent-face-and-supporting-actions...Daniel Pittman2011-05-034-15/+24
| |\ \
| | * | (#7277)Fixing all secret-agent functions, and the agent itselfLuke Kanies2011-05-034-15/+24
| * | | Merge branch 'ticket/2.7.x/7139' into 2.7.xNick Lewis2011-05-032-1/+8
| |\ \ \ | | |/ / | |/| |
| | * | (#7139) Accept '/' as a valid path in filesetsNick Lewis2011-05-032-1/+8
| * | | (#7329) Consistent naming for rendering formats and hooks.Daniel Pittman2011-05-033-2/+23
| * | | Merge branch 'bug/2.7.x/7326-faces-broken-on-ruby-1.8.5' into 2.7.xDaniel Pittman2011-05-031-1/+4
| |\ \ \ | | |/ / | |/| |
| | * | (#7326) Fix faces on Ruby 1.8.5Daniel Pittman2011-05-031-1/+4
| * | | Merge branch 'tickets/2.7.x/7117-authconf-should-respect-environments' into 2...Jacob Helwig2011-05-032-3/+7
| |\ \ \ | | |/ / | |/| |
| | * | (#7117) Return the environment as a Puppet::Node::Environment in uri2indirectionJacob Helwig2011-05-032-3/+7
| |/ /
| * | Merge branch 'bug/2.7.x/7276-return-value-from-plugin-download-is-not-user-fr...Daniel Pittman2011-05-036-2/+27
| |\ \
| | * | (#7276) Better reporting from the plugin download action.Daniel Pittman2011-05-032-0/+22
| | * | (#7276) Create a plugin face application.Daniel Pittman2011-05-031-0/+3
| | * | (#6962) Added 'returns' block to action documentation.Daniel Pittman2011-05-031-0/+2
| | * | maint: remove emacs 'coding' cookie from files.Daniel Pittman2011-05-032-2/+0
| |/ /
* / / add base test for ticket 7117Dominic Maraglia2011-05-031-0/+20
|/ /
* | Merge branch 'feature/2.7.x/7278-improve-catalog-select-action' into 2.7.xDaniel Pittman2011-05-031-1/+17
|\ \
| * | (#7278) Improve utility of the Catalog select actionLuke Kanies2011-05-031-1/+17
|/ /
* | Merge branch 'feature/2.7.x/7279-add-action-to-file-face' into 2.7.xDaniel Pittman2011-05-034-1/+60
|\ \ | |/ |/|
| * (#7279) Adding some basic file actionsLuke Kanies2011-05-034-1/+60
|/
* Merge branch 'bug/2.7.x/7314-backtrace-when-face-has-syntax-error' into 2.7.xDaniel Pittman2011-05-0218-52/+72
|\
| * (#7314) Faces fail horribly when one has a syntax error.Daniel Pittman2011-05-023-14/+34
| * maint: move the indirector face base out of puppet/faceDaniel Pittman2011-05-0215-36/+35
| * maint: reset more global state in testing faces...Daniel Pittman2011-05-021-2/+3
* | Merge branch 'bug/2.7.x/7315-puppet-status-can't-render-as-json' into 2.7.xDaniel Pittman2011-05-022-1/+5
|\ \
| * | (#7315) Fix `to_pson` method to render correctly.Daniel Pittman2011-05-022-1/+5
| |/
* | Merge branch 'bug/2.7.x/better-error-reporting-in-face-cli-facade' into 2.7.xDaniel Pittman2011-05-025-63/+54
|\ \ | |/ |/|
| * (#7304) Improve help from `puppet foo`Daniel Pittman2011-05-023-8/+6
| * (#7317) better error handling in CLI face facade.Daniel Pittman2011-05-022-55/+48
|/
* Merge branch 'bug/2.7.x/7282-fail-when-no-invocation-given-for-action' into 2...Daniel Pittman2011-05-027-23/+76
|\
| * (#7282) action without `when_invoked` should fail...Daniel Pittman2011-05-027-23/+76
* | (Maint.) Fix accidental debug output in tests.Pieter van de Bruggen2011-04-291-1/+1
|/
* Merge branch 'bug/2.7.x/7221-whitespace-stripping-for-documentation' into 2.7.xDaniel Pittman2011-04-292-55/+116
|\
| * (#7221) Strip bad whitespace from face and action docs.Daniel Pittman2011-04-292-55/+116
* | Merge branch 'tickets/2.7.x/7289' into 2.7.xPieter van de Bruggen2011-04-295-125/+212
|\ \ | |/ |/|
| * (#7289) Specify order for option decorations.Pieter van de Bruggen2011-04-295-125/+212
* | (#7248) Fail if two aliases of one option are passed...Daniel Pittman2011-04-292-0/+33
* | Revert "maint: better error reporting for argument count mismatch."Daniel Pittman2011-04-281-39/+47
* | maint: better error reporting for argument count mismatch.Daniel Pittman2011-04-281-47/+39
* | Merge branch 'bug/2.7.x/7122-puppet-facts-find-raises' into 2.7.xDaniel Pittman2011-04-2810-66/+192
|\ \
| * | (#7122) Enforce call arity on actions in the CLI wrapper.Daniel Pittman2011-04-287-19/+68
| * | maint: add a 'print' matcher to rspec, to inspect std{out,err}Daniel Pittman2011-04-284-47/+124
|/ /
* | Merge branch 'feature/2.7.x/7160-support-json-externally' into 2.7.xDaniel Pittman2011-04-282-81/+91
|\ \