new file:   README
	new file:   manifests/nodes/splunkfwder01.pp
	new file:   manifests/nodes/splunkfwder02.pp
	new file:   manifests/nodes/splunkindex01.pp
	new file:   manifests/nodes/splunkindex02.pp
	new file:   manifests/nodes/splunkmaster01.pp
	new file:   manifests/nodes/splunkmaster02.pp
	new file:   manifests/nodes/splunksearcher01.pp
	new file:   manifests/nodes/splunksearcher02.pp
	new file:   manifests/site.pp
	new file:   mysplunk/files/passwd
	new file:   mysplunk/files/splunk.license
	new file:   mysplunk/init.pp
	new file:   mysplunk/manifests/fwders.pp
	new file:   mysplunk/manifests/indexers.pp
	new file:   mysplunk/manifests/master.pp
	new file:   mysplunk/manifests/peers.pp
	new file:   mysplunk/manifests/searchers.pp
	new file:   mysplunk/templates/forwarder-inputs.conf.erb
	new file:   mysplunk/templates/forwarder-outputs.conf.erb
	new file:   mysplunk/templates/forwarder-server.conf.erb
	new file:   mysplunk/templates/indexer-inputs.conf.erb
	new file:   mysplunk/templates/indexer-server.conf.erb
	new file:   mysplunk/templates/master-server.conf.erb
	new file:   mysplunk/templates/searcher-server.conf.erb
Merge github.com:basigabri/dsmc_puppet

Conflicts:
	mysplunk/init.pp
	mysplunk/templates/indexer-server.conf.erb
	mysplunk/templates/master-server.conf.erb
	mysplunk/templates/searcher-server.conf.erb

	modified:   mysplunk/init.pp
	modified:   mysplunk/templates/indexer-server.conf.erb
	modified:   mysplunk/templates/master-server.conf.erb
	modified:   mysplunk/templates/searcher-server.conf.erb
	new file:   readme