Merge branch 'master' into dummy-provider
authorAaron Stone <aaron@serendipity.cx>
Fri, 19 Oct 2012 08:35:10 +0000 (01:35 -0700)
committerAaron Stone <aaron@serendipity.cx>
Fri, 19 Oct 2012 08:35:10 +0000 (01:35 -0700)
Conflicts:
lib/puppet/provider/vcsrepo/cvs.rb
spec/support/fixture_helpers.rb
spec/unit/puppet/provider/vcsrepo/cvs_spec.rb

1  2 
README.GIT.markdown
lib/puppet/provider/vcsrepo/cvs.rb

@@@ -53,7 -53,26 +53,26 @@@ For a specific revision or branch (can 
          source => 'git://example.com/repo.git',
          revision => 'development'
      }
 -    
 +
+ Check out as a user:
+     vcsrepo { "/path/to/repo":
+         ensure => present,
+         provider => git,
+         source => 'git://example.com/repo.git',
+         revision => '0c466b8a5a45f6cd7de82c08df2fb4ce1e920a31',
+         user => 'someUser'
+     }
+ Keep the repository at the latest revision (note: this will always overwrite local changes to the repository):
+     vcsrepo { "/path/to/repo":
+         ensure => latest,
+         provider => git,
+         source => 'git://example.com/repo.git',
+         revision => 'master',
+     }
  For sources that use SSH (eg, `username@server:...`)
  ----------------------------------------------------
  
Simple merge