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/hg | |
| 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 'examples/hg')
| -rw-r--r-- | examples/hg/clone.pp | 2 | ||||
| -rw-r--r-- | examples/hg/init_repo.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/hg/clone.pp b/examples/hg/clone.pp index 92b3335..be2d955 100644 --- a/examples/hg/clone.pp +++ b/examples/hg/clone.pp @@ -2,5 +2,5 @@ vcsrepo { '/tmp/vcstest-hg-clone': ensure => present, provider => hg, source => 'http://hg.basho.com/riak', - revision => 'riak-0.5.3' + revision => 'riak-0.5.3', } diff --git a/examples/hg/init_repo.pp b/examples/hg/init_repo.pp index 52aba4c..a890804 100644 --- a/examples/hg/init_repo.pp +++ b/examples/hg/init_repo.pp @@ -1,4 +1,4 @@ vcsrepo { '/tmp/vcstest-hg-init': ensure => present, - provider => hg + provider => hg, } |