Merge branch 'master' of git://github.com/miah/chef-collectd
Merge branch 'master' of git://github.com/miah/chef-collectd
Merge branch 'master' of git://github.com/miah/chef-collectd
Fix collectd config file CamelCase for data_bag_plugins (Closes #25)
Fix collectd config file CamelCase for data_bag_plugins (Closes #25)
Simplify collectd_key to always output CamelCase for both String & Symbol input
Merge branch 'fix-camelcase' of github.com:trinitronx/chef-collectd into fix-camelcase

Conflicts:
	libraries/default.rb
created resource type exec template
updated readme with example
cleaned up template
fixed incorrect declaration
actually fix the error
updated exception
updated resource syntax & docs
Merge pull request #28 from phoolish/exec_plugin

Exec plugin
Merge pull request #31 from phoolish/purge_plugins

Purge plugins
Merge pull request #26 from trinitronx/fix-camelcase

Fix collectd config file CamelCase for data_bag_plugins (Closes #25)
Merge branch 'master' of git://github.com/miah/chef-collectd
Ingore newer vim files
Update Gemfile to fix missing test-kitchen failure