summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | maint: fix spec_helper inclusions again.Daniel Pittman2011-05-1717-45/+25
| * | | | | | Adding a sleep state post starting masterDominic Maraglia2011-05-181-0/+3
* | | | | | | Merge branch 'next'Pieter van de Bruggen2011-05-1785-314/+1026
|\| | | | | |
| * | | | | | Merge branch '2.7.next' into nextPieter van de Bruggen2011-05-1783-314/+694
| |\| | | | |
| | * | | | | Merge branch '2.7.x' into 2.7.nextPieter van de Bruggen2011-05-1775-203/+203
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | Merge branch 'tickets/2.7.x/7507' into 2.7.xPieter van de Bruggen2011-05-172-2/+2
| | | |\ \ \
| | | | * | | (#7507) Add more filters for Ruby 1.9 spec failuresPieter van de Bruggen2011-05-172-2/+2
| | | |/ / /
| | | * | | Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.xMatt Robinson2011-05-1763-189/+188
| | | |\ \ \
| | | | * | | (#7507) Add ability to filter Ruby 1.9 spec failuresMatt Robinson2011-05-1759-102/+102
| | | | * | | (#7507) Fix when_invoked action specs in Ruby 1.9Matt Robinson2011-05-174-87/+86
| | | * | | | Merge branch 'ticket/2.7.x/7297' into 2.7.xNick Lewis2011-05-161-1/+1
| | | |\ \ \ \
| | | | * | | | (#7297) Fix Puppet::Resource#to_manifest in Ruby 1.9Nick Lewis2011-05-161-1/+1
| | | |/ / / /
| | | * | | | Merge branch 'ticket/2.7.x/7298' into 2.7.xNick Lewis2011-05-161-0/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | (#7298) require 'English' to provide $CHILD_STATUS in Ruby 1.9Nick Lewis2011-05-161-0/+1
| | | |/ / /
| | | * | | Merge branch 'ticket/2.7.x/7291-ruby19-fixes' into 2.7.xMatt Robinson2011-05-169-11/+11
| | | |\ \ \
| | | | * | | (#7291) Fix issues with instance_methods in Ruby 1.9Matt Robinson2011-05-165-7/+7
| | | | * | | (#7291) Fixed ascii problem with Ruby 1.9.2Matt Robinson2011-05-161-1/+1
| | | | * | | (#7291) Fix Ruby 1.9 face failuresMatt Robinson2011-05-161-1/+1
| | | | * | | (#7291) The 'script' version of actions needs options argumentMatt Robinson2011-05-162-2/+2
| | | |/ / /
| | * | | | Merge branch 'ticket/2.7.next/7114' into 2.7.nextNick Lewis2011-05-165-108/+420
| | |\ \ \ \
| | | * | | | (#7114) Fix specs for ssh authorized key parsed providerNick Lewis2011-05-161-32/+21
| | | * | | | (#7114) Target returns correct valueStefan Schulte2011-05-161-6/+0
| | | * | | | (#7114) Add integration tests for authorized_keyStefan Schulte2011-05-161-0/+207
| | | * | | | (#7114) Improve unit tests for ssh_authorized_keyStefan Schulte2011-05-161-70/+180
| | | * | | | (#7114) Improve value validation for authorized_keyStefan Schulte2011-05-161-0/+12
| | |/ / / /
| | * | | | Merge branch 'ticket/2.7.x/7300' into 2.7.nextNick Lewis2011-05-162-0/+59
| | |\ \ \ \
| | | * | | | (#7300) Fix instances method of mount providerStefan Schulte2011-05-161-0/+18
| | | * | | | (#7300) Add specs for the mount providerStefan Schulte2011-05-011-0/+41
| | * | | | | Merge branch 'tickets/2.7.x/7259-make-active-record-test-requirement-optional...Jacob Helwig2011-05-162-3/+12
| | |\ \ \ \ \
| | | * | | | | (#7259) Remove ActiveRecord requirement from indirector face specJacob Helwig2011-05-161-2/+11
| | | * | | | | (#7259) Do not try to load all Terminus classes when configuring the IndirectorJacob Helwig2011-05-161-1/+1
| | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 'ticket/next/1853-pacman-provider' into nextMax Martin2011-05-162-0/+332
| |\ \ \ \ \ \
| | * | | | | | (#1853) Pacman package providerPaul Boyd2011-05-161-0/+1
| | * | | | | | (#1853) Pacman package providerPaul Boyd2011-05-162-0/+331
| |/ / / / / /
* | | | | | | Merge branch 'next'Matt Robinson2011-05-137-157/+29
|\| | | | | |
| * | | | | | Merge branch '2.7.next' into nextMatt Robinson2011-05-137-157/+29
|/| | | | | | | |/ / / / /
| * | | | | Merge branch '2.7.x' into 2.7.nextMatt Robinson2011-05-134-61/+73
| |\| | | |
| | * | | | Merge branch 'ticket/2.7.x/7469-rake-failures' into 2.7.xMax Martin2011-05-121-0/+2
| | |\ \ \ \
| | | * | | | (#7469) Add license to test face so tests passMax Martin2011-05-121-0/+2
| | |/ / / /
| | * | | | Merge branch 'ticket/2.7.x/7264-metaparameter_reference' into 2.7.xnfagerlund2011-05-121-40/+44
| | |\ \ \ \
| | | * | | | (#7264) Docs: Clarify that subscribe/notify imply require/beforenfagerlund2011-05-121-40/+44
| | |/ / / /
| | * | | | Merge branch 'tickets/2.7.x/7299' into 2.7.xMax Martin2011-05-103-1/+12
| | |\ \ \ \
| | | * | | | Prevent spec failure caused by network device mock leakBrice Figureau2011-05-072-0/+9
| | | * | | | Fix #7299 - do not require net/ssh for running rake specBrice Figureau2011-05-071-1/+3
| | * | | | | Merge branch 'ticket/2.7.x/7468-stub_xmlrpc_internet_call' into 2.7.xMatt Robinson2011-05-101-20/+24
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | (#7468) Stub spec that tries to connect to pypi.python.orgMatt Robinson2011-05-101-20/+24
| | |/ / / /
| * | | | | Revert "(#7220) Add the ability to "inherit" options."Daniel Pittman2011-05-124-136/+0
* | | | | | Merge branch 'next'Daniel Pittman2011-05-12131-1077/+3041
|\ \ \ \ \ \
| * | | | | | Merge branch '2.7.next' into nextDaniel Pittman2011-05-12127-1037/+2919
| |\| | | | |
| | * | | | | maint: sync 'authconfig' to 'rest_authconfig' settingDaniel Pittman2011-05-121-1/+1