summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge branch '2.6.x' into 2.7.nextDaniel Pittman2011-05-127-10/+183
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | 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
| | | | |/ / / /
| | | | * | | | Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into 2.6....Max Martin2011-04-283-1/+172
| | | | |\ \ \ \
| | | | | * | | | vim: Initial ftplugin and indent supportTodd Zullinger2011-04-023-1/+172
| | | | * | | | | Merge branch 'ticket/2.6.next/6844' into 2.6.nextMax Martin2011-04-281-2/+1
| | | | |\ \ \ \ \
| | | | | * | | | | case seems needless here as there is only two opts, also the rest of the file...ben hengst2011-04-281-2/+1
| | | | |/ / / / /
| | | | * | | | | Merge branch 'ticket/2.6.x/6845' into 2.6.nextJames Turnbull2011-04-281-1/+1
| | | | |\ \ \ \ \
| | | | | * | | | | (#6845) Mount writes incorrect vfstab entriesStefan Schulte2011-04-281-1/+1
| | | | |/ / / / /
| | | | * | | | | Merge branch 'ticket/2.6.next/6442-agent_doesnt_need_namespaceauth' into 2.6....Matt Robinson2011-04-272-3/+3
| | | | |\ \ \ \ \
| | | | | * | | | | (#6442) Be able to start agents --listen without namespaceauth.confMatt Robinson2011-04-272-3/+3
| | | | |/ / / / /
| | | * | | | | | 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
| | * | | | | | | Merge branch '2.7.x' into 2.7.nextDaniel Pittman2011-05-06122-1028/+2737
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Updated CHANGELOG for 2.7.0rc2Daniel Pittman2011-05-061-0/+163
| | | * | | | | | Merge branch 'bug/2.7.x/7353-kill-for-humans-format-entirely' into 2.7.xDaniel Pittman2011-05-055-60/+18
| | | |\ \ \ \ \ \
| | | | * | | | | | (#7353) Remove :for_humans format entirely.Daniel Pittman2011-05-055-60/+18
| | | |/ / / / / /
| | | * | | | | | Merge remote-tracking branch 'nfagerlund/ticket/2.7.x/6962' into 2.7.xDaniel Pittman2011-05-0520-37/+438
| | | |\ \ \ \ \ \
| | | | * | | | | | (Maint) Adjust documentation whitespacenfagerlund2011-05-0418-223/+225
| | | | * | | | | | (#7303) Remove reference to not-yet-extant man actionnfagerlund2011-05-041-1/+0
| | | | * | | | | | (#6962) Add self-documentation data to puppet facesnfagerlund2011-05-0418-27/+389
| | | | * | | | | | Maint: adjust faces.rb's help to match that of other applicationsnfagerlund2011-05-041-6/+44
| | | * | | | | | | Adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| | | * | | | | | | add clean-up step to test for ticket_5477 to prevent site.pp from leaking to ...Dominic Maraglia2011-05-041-0/+3
| | | * | | | | | | fixed test for ticket_7117Dominic Maraglia2011-05-041-0/+11
| | | * | | | | | | Merge branch 'tickets/2.7.x/7179' into 2.7.xPieter van de Bruggen2011-05-043-12/+7
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | (#7179) Modify default ACL for /node/<name>.Pieter van de Bruggen2011-05-043-12/+7
| | | * | | | | | | Merge branch 'tickets/2.7.x/7304' into 2.7.xNigel Kersten2011-05-041-6/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | (#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