projects
/
puppet_vcsrepo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7be38d4
08c9ee5
)
Merge branch '1.0.x'
author
Hunter Haugen
<hunter@puppetlabs.com>
Thu, 5 Jun 2014 17:49:59 +0000
(10:49 -0700)
committer
Hunter Haugen
<hunter@puppetlabs.com>
Thu, 5 Jun 2014 17:49:59 +0000
(10:49 -0700)
Conflicts:
Modulefile
1
2
Modulefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Modulefile
index
7b41839
,
52dede3
..
8a468ab
---
1
/
Modulefile
---
2
/
Modulefile
+++ b/
Modulefile
@@@
-1,4
-1,4
+1,4
@@@
-name 'puppetlabs
/
vcsrepo'
+name 'puppetlabs
-
vcsrepo'
- version '
0.2
.0'
+ version '
1.0
.0'
summary 'Manage repositories from various version control systems'
description 'Manage repositories from various version control systems'