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 /examples/svn | |
parent | 72df8ecb489c13a0bf7bdb78455e6d523404dd8b (diff) | |
parent | 109d181b8ec6130151b2e8144cdaecf986a96075 (diff) | |
download | puppet-vcsrepo-2b540b6d2b3c6acab48ad1515b4d5da98d363391.tar.gz puppet-vcsrepo-2b540b6d2b3c6acab48ad1515b4d5da98d363391.tar.bz2 |
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 'examples/svn')
-rw-r--r-- | examples/svn/checkout.pp | 3 | ||||
-rw-r--r-- | examples/svn/server.pp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/examples/svn/checkout.pp b/examples/svn/checkout.pp index 1fceb7b..f9fc273 100644 --- a/examples/svn/checkout.pp +++ b/examples/svn/checkout.pp @@ -1,6 +1,5 @@ vcsrepo { '/tmp/vcstest-svn-checkout': ensure => present, provider => svn, - source => 'http://svn.edgewall.org/repos/babel/trunk' + source => 'http://svn.edgewall.org/repos/babel/trunk', } - diff --git a/examples/svn/server.pp b/examples/svn/server.pp index eaf6b27..de7c390 100644 --- a/examples/svn/server.pp +++ b/examples/svn/server.pp @@ -1,4 +1,4 @@ vcsrepo { '/tmp/vcstest-svn-server': ensure => present, - provider => svn + provider => svn, } |