Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Be sure taht zabbix_agent is start and enable
add a service_state attribute
Default values can/must be in attribute file
Remove mysql-devel package because it conflicts with some versions of mysql (percona) and isn't required to build the server
allow graph items to map to a host or a template
remove new_resource.template from the graph provider because it doesn't make sense; template is a graph_item property
Merge branch 'upstream'
add configuration options for java gateway
default to 0 java pollers
allow defining of host macros
Merge pull request #81 from Youscribe/attribute_web

Simple fix in web recipe
Merge pull request #82 from RiotGames/graph_items_from_hosts

Graph items from hosts
Merge pull request #83 from RiotGames/remove_mysql_devel

Remove mysql-devel package
Merge pull request #84 from RiotGames/java_gateway

Java gateway configuration
Merge pull request #85 from RiotGames/host_macros

Allow defining of host macros
Merge pull request #78 from Youscribe/service_start

Be sure that zabbix_agent is start and enable