Take 'disk' out from disks to monitor
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-271
Remove "disk" string from snmp monitoring
Added test for disk entry in snmpd.conf
Merge pull request #271 from ppp0/issue-271

Refactor snmpd template for disks
Add unzip module
Require unzip in ruby::gems
Merge pull request #286 from njam/issue-286

Add unzip dep to ruby::gems
Configure puppet in puppet-install.sh
Merge pull request #287 from njam/issue-287

Configure puppet in puppet-install.sh
Fix bash loop and cutting
Merge pull request #288 from njam/issue-288

Fix set-write-cache-off
added permissions param for exported resource
Merge pull request #289 from kris-lab/issue-289

NFS: fix exported directory permisions
Add script for copying puppet ssl certs to puppetdb
Fix local puppetdb instllation, run config script
Increase timeout time for monit
Remove incorrectly commited hiera.json
Merge pull request #290 from tomaszdurka/issue-290

Fix puppetdb jetty configuration
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-285

Conflicts:
	modules/puppet/manifests/master.pp