diff options
| author | Aaron Stone <aaron@serendipity.cx> | 2012-10-19 01:35:10 -0700 |
|---|---|---|
| committer | Aaron Stone <aaron@serendipity.cx> | 2012-10-19 01:35:10 -0700 |
| commit | 2b540b6d2b3c6acab48ad1515b4d5da98d363391 (patch) | |
| tree | 6a2223ea8ea36790943ec8e433868ebbda6d690c /lib | |
| parent | 72df8ecb489c13a0bf7bdb78455e6d523404dd8b (diff) | |
| parent | 109d181b8ec6130151b2e8144cdaecf986a96075 (diff) | |
Merge branch 'master' into dummy-provider
Conflicts:
lib/puppet/provider/vcsrepo/cvs.rb
spec/support/fixture_helpers.rb
spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/vcsrepo/cvs.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/type/vcsrepo.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/vcsrepo/cvs.rb b/lib/puppet/provider/vcsrepo/cvs.rb index 467e2f9..6dc7882 100644 --- a/lib/puppet/provider/vcsrepo/cvs.rb +++ b/lib/puppet/provider/vcsrepo/cvs.rb @@ -116,5 +116,4 @@ Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) set_ownership end end - end diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb index 4b53235..1fd006b 100644 --- a/lib/puppet/type/vcsrepo.rb +++ b/lib/puppet/type/vcsrepo.rb @@ -135,6 +135,7 @@ Puppet::Type.newtype(:vcsrepo) do newparam :user do desc "The user to run for repository operations" + defaultto 'root' end newparam :excludes do |