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/git | |
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/git')
-rw-r--r-- | examples/git/bare_init.pp | 2 | ||||
-rw-r--r-- | examples/git/clone.pp | 2 | ||||
-rw-r--r-- | examples/git/working_copy_init.pp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/git/bare_init.pp b/examples/git/bare_init.pp index f16d137..4166f6e 100644 --- a/examples/git/bare_init.pp +++ b/examples/git/bare_init.pp @@ -1,4 +1,4 @@ vcsrepo { '/tmp/vcstest-git-bare': ensure => bare, - provider => git + provider => git, } diff --git a/examples/git/clone.pp b/examples/git/clone.pp index b7d5bfb..b29a4fd 100644 --- a/examples/git/clone.pp +++ b/examples/git/clone.pp @@ -1,5 +1,5 @@ vcsrepo { '/tmp/vcstest-git-clone': ensure => present, provider => git, - source => 'git://github.com/bruce/rtex.git' + source => 'git://github.com/bruce/rtex.git', } diff --git a/examples/git/working_copy_init.pp b/examples/git/working_copy_init.pp index b20af20..e3352eb 100644 --- a/examples/git/working_copy_init.pp +++ b/examples/git/working_copy_init.pp @@ -1,4 +1,4 @@ vcsrepo { '/tmp/vcstest-git-wc': ensure => present, - provider => git + provider => git, } |