change the way the cookie is sent to the emulator
remove the default cookie setting otherwise it will override the env variable
Merge pull request #36 from default50/riemann-freeswitch

Fixed two bugs:
Merge pull request #37 from Bhuwan/master

allow dynamic setting of riak cookie field
Version 0.1.2
Config to use FQDN or hostname for riemann resmon

By default riemann-resmon was using the FQDN of the server it was
checking as the event hostname. This was slightly annoying as it meant
that went submitting metrics from an application you had to submit as
the FQDN.

This change allows you to select the behaviour, by default it will use
the hostname of the server it is checking.
riemann-haproxy: don't report nil properties.
Merge branch 'master' of github.com:aphyr/riemann-tools
Add ability to add attributes from CLI
Merge pull request #38 from campanja/attributes-flags

Add ability to add attributes from CLI
Merge branch 'master' of github.com:aphyr/riemann-tools
Remove duplicated file. Closes https://github.com/aphyr/riemann-tools/issues/34
Merge pull request #39 from default50/remove_kvminstances

Remove duplicated file riemann-kvminstances.
Merge branch 'master' of git://github.com/aphyr/riemann-tools into riemann_resmon_host_config
Handle timeouts. These can happen when we're sending data over TCP and
are waiting for the server to acknowledge, but the response gets lost somewhere.

We need to reconnect after we've timed out in order to flush delayed responses.
Merge pull request #42 from campanja/handle-timeouts

Handle timeouts
Remove dead code.

Also remove stdout spam in riemann-health.
Merge pull request #43 from campanja/remove-dead-code

Remove dead code
Merge pull request #41 from digital-science/riemann_resmon_host_config

Allow riemann resmon to use hostname or FQDN for events
Merge branch 'master' of github.com:aphyr/riemann-tools