Merge remote branch 'immerda/master'

Conflicts:
	lib/puppet/parser/functions/gsub.rb
	lib/puppet/parser/functions/prefix_with.rb
	lib/puppet/parser/functions/sha1.rb
	lib/puppet/parser/functions/slash_escape.rb
	lib/puppet/parser/functions/substitute.rb
	manifests/classes/lsb_release.pp
	manifests/defines/concatenated_file.pp
	manifests/defines/config_file.pp
	manifests/defines/line.pp
	manifests/defines/module_dir.pp
	manifests/defines/module_file.pp
	manifests/defines/replace.pp
	manifests/init.pp

1 files changed, 0 insertions, 19 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index f767030..3a9faf5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,23 +3,4 @@
 # See LICENSE for the full license granted to you.
 
 import "defines/*.pp"
-import "classes/*.pp"
-
-module_dir { [ 'common' ]: }
-
-file {
-		 # Module programmers can use /var/lib/puppet/modules/$modulename to save
-		 # module-local data, e.g. for constructing config files. See module_dir
-		 # for details
-       "/var/lib/puppet/modules":
-               ensure => directory,
-               source => "puppet://$server/modules/common/modules",
-               ignore => ".ignore",
-               recurse => true, purge => true, force => true,
-               mode => 0755, owner => root, group => 0;
-}
-
-# common packages
-class pkg::openssl { package { openssl: ensure => installed } }
-class pkg::rsync { package { rsync: ensure => installed } }