Add slope and metric group for ganglia output.
Add simple CIDR filter.
Fix syntax
Update to reflect 1.2
Update links for configuration details
fix ordering
- use milestones
- use event[...] now
- fix references to event.message (now is event["message"])
- update old references to event.tags, event.unix_timestamp, and
event.ruby_timestamp
Merge pull request #583 from divanikus/master

Add slope and metric group for ganglia output.
- refactor json_encode filter to use source+target settings
- add specs to cover json_encode
Use wget-or-curl in Makefile to fetch vendor/geoip data file
Remove stray comma.

It was creating an event with the file field looking like this:

    "file" => [
        [0] "?:?",
        [1] "?"
    ]

Now it looks like:

    "file" => "?:?"
Fix log4j logging when redirecting output to a file (LOGSTASH-1274)
- stop hacking support for in/regexp stuff; this fixes negating regexps
and other things.
- skip tests that use jruby-specific features (with an obvious TODO item
implied that we'll make it work under MRI/RBX eventually)
Merge pull request #613 from JonathanTron/LOGSTASH-1274

Fix log4j logging when redirecting output to a file (LOGSTASH-1274)
Merge pull request #611 from JonathanTron/allow-curl-for-geoip-fetch

Use wget-or-curl in Makefile to fetch vendor/geoip data file
- try to improve error reporting even when --log is specified
- remove extra prints
Merge branch 'master' of github.com:logstash/logstash

Conflicts:
	lib/logstash/logging.rb