- remove some unused stuff
Use 4560 (log4j default) as default port
- raise an exception if you try to set @timestamp to an invalid value
type. OH STATIC TYPING SOMETIMES I MISS YOU.
Fix link to FPM
Adding COMMONAPACHELOG format
Merge branch 'master' of https://github.com/kurtado/logstash
HOSTPORT didn't parse anything useful

Changed HOSTPORT to a simple combination of IPORHOST and POSINT. What was the old pattern supposed to do and what does =~ mean?
Refactor netflow codec.

Netflow field definitions are now extracted to a bundled YAML file and also
introduces a new config directive to specify an additional YAML file that
can be used to augment the built-in list. This means adding new Netflow field
types doesn't require a rebuild of Logstash.

TODO Work out how to get the YAML file added to the jar.
Add example YAML to documentation
Pull Netflow YAML file into the jar.
Added file with patterns for JUNOS 11.4 RT_FLOW log messages
output : csv - Create a CSV file output

Allows writing of events to CSV or other delimited files

Based on existing file output, using ruby CSV lib
output : csv - add documentation comments
[rabbitmq] Change auto-delete and exclusive defaults to `false`

Otherwise the queue will be removed when Logstash is shutdown or
restarted. In general, both attributes don't make much sense
in the context of Logstash. Also, most if not all popular
RabbitMQ clients default both attributes to `false`.

This is a breaking change so perhaps requires a more
visible change log entry.

Fixes #859.
updating from upstream
Merge remote-tracking branch 'upstream/master'
Documentation updates to keep things readable (and not invisible or missing).
Merge branch 'master' of https://github.com/logstash/logstash

# By Jordan Sissel (8) and tobyw4n (1)
# Via Jordan Sissel
* 'master' of https://github.com/logstash/logstash:
  version bump
  CHANGELOG
  Fix in-jar path
  make it a url in markdown
  Fix spacing (spaces not tabs) to make it show up in the docs
  Update changelog
  Update milestones for some plugins with good tests
  Set date
  digest/sha2 was required for sqs to connect successfully

Conflicts:
	lib/logstash/inputs/collectd.rb
	lib/logstash/outputs/elasticsearch.rb
	lib/logstash/outputs/elasticsearch_http.rb
Bug fix: Test for Java methods for template management
Template management will not work for versions of Elasticsearch older than 0.90.5
This patch now checks for template management capability and logs on fail

Updated docs in both elasticsearch outputs to remain in harmony.
Merge pull request #847 from mattgray/csv-output

CSV output
Merge pull request #873 from untergeek/master

Bug fix: Test for Java methods for template management