keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:Rhizomatica/puppet

Browse source 
Conflicts:
	modules/rhizo_base/manifests/init.pp
This commit is contained in:
Keith 2016-04-28 00:53:20 +01:00
commit ea22571199
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/rhizo_base/manifests/init.pp
View file

@ -190,7 +190,11 @@ class rhizo_base {
ensure => present, ensure => present,
provider => git, provider => git,
source => 'https://github.com/Rhizomatica/rccn.git', source => 'https://github.com/Rhizomatica/rccn.git',
<<<<<<< HEAD
revision => '1.0.83', revision => '1.0.83',
=======
revision => '1.0.82',
>>>>>>> 4616dfa0a77da734aa897db484684d04fe5b711c
require => [ File['/var/rhizomatica'], Package['git'] ], require => [ File['/var/rhizomatica'], Package['git'] ],
notify => [ Exec['locale-gen'], notify => [ Exec['locale-gen'],
Exec['restart-freeswitch'], Exec['restart-freeswitch'],