Use 4560 (log4j default) as default port
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
[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'
Merge remote-tracking branch 'upstream/master'
initial version of getting-start asciidoc (WIP)
formatting "improvements"
Fix problem in MONTHNUM and add DATESTAMP_EVENTLOG pattern and 

Whilst trying to get Windows Event Log data into logstash I had some problems with the the timestamp format Windows uses.

Taking an example value (the TimeGenerated field provided by the eventlog input):

20131218141650.687853-000

And using:

%{YEAR}%{MONTHNUM}%{MONTHDAY}%{HOUR}%{MINUTE}%{SECOND}

I get a %{MONTHNUM} value of 1, but it should be 12. This is because the MONTHNUM pattern allows for single digit month values. I created a new pattern which removed this flexibility:

MONTHNUM2 (?:0[1-9]|1[0-2])

This, along with the pattern below works as I would expect:

DATESTAMP_EVENTLOG %{YEAR}%{MONTHNUM2}%{MONTHDAY}%{HOUR}%{MINUTE}%{SECOND}

I'm sure there's a better way of implementing this but I think this is a genuine problem.
Merge branch 'master' of git://github.com/logstash/logstash
initial version of getting-start asciidoc (WIP)
formatting "improvements"
revving
content complete
Merge branch 'tutorial' of https://github.com/kurtado/logstash into tutorial

Conflicts:
	docs/tutorials/getting-started-with-logstash.asciidoc