diff options
author | Micah Anderson <micah@riseup.net> | 2011-04-01 13:29:43 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2011-04-01 13:29:43 -0400 |
commit | f2846099d1e24589600d6a3a346ab92e5c65f843 (patch) | |
tree | 9bc6b1ba9502c3bd42b64a4834ef91dc7f7fce5a /manifests/base.pp | |
parent | 74ccc33ff4f0158e80db4dbc64d4edc490acb26c (diff) | |
parent | 5c746aa9a4ee5748cbaa6812a508e3dd878b621c (diff) |
Merge remote-tracking branch 'lavamind/master'
Conflicts:
manifests/daemon.pp
manifests/daemon/disable.pp
manifests/daemon/vhosts.pp
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 06742a7..51140b6 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,5 +1,6 @@ class git::base { - package{'git': + package { 'git': ensure => present, + alias => 'git', } } |