Merge pull request #842 from jordansissel/seriously-use-utf-8

Force the default string encoding to be UTF-8.
Fix markdown syntax (LOGSTASH-1684)

Slightly more complete fix for LOGSTASH-1684. The backticks
are also more consistent with the aws_config.rb mixin that
contributes to the sns output docs.
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
Merge branch 'packaging-conffiles-and-rpm-improvements' of https://github.com/mfournier/logstash into mfournier-packaging-conffiles-and-rpm-improvements

Conflicts:
	Makefile
Merge pull request #813 from khsing/master

Add a punctuation filter
[rabbitmq] Bunny 1.0.5+
Merge branch 'pull/801'
Merge pull request #801 from michaelklishin/patch-1

[rabbitmq] Bunny 1.0.5+
Merge pull request #802 from fotonauts/LOGSTASH-1634

Logstash 1634
Thanks for making Logstash more awesome! :)

In the future we will be changing from describing any field as "nested" and instead just refer to all fields as "field references."
Merge pull request #817 from jbochi/metrics

Make metric filter's rate and percentiles configurable
Merge pull request #845 from bfritz/LOGSTASH-1684

Fix markdown syntax (LOGSTASH-1684)
Merge pull request #795 from bfritz/improve-oldlogstashjson-codec

improve oldlogstashjson codec
Merge pull request #742 from atwardowski/patch-1

Update logstash.sysv.redhat

Thanks for making Logstash more awesome! :)
Merge pull request #754 from jdve/rerun-pipe

inputs: pipe: rerun command when it terminates
Thanks for making Logstash more awesome!
Merge pull request #752 from avleen/sumnumbers

adding sum numbers filter

Merged!

Thanks for making Logstash more awesome!
Merge pull request #803 from bodgit/uuid

Make the "field" field required for the uuid filter.
Merge pull request #740 from ascariandrea/s3-region-fix

Fixed region_endpoint bad check
Merged!

Thanks for making Logstash more awesome!
Merge branch 'master' of https://github.com/logstash/logstash

# By Brad Fritz (7) and others
# Via Jordan Sissel (13) and others
* 'master' of https://github.com/logstash/logstash: (35 commits)
  [rabbitmq] Bunny 1.0.5+
  Fix markdown syntax (LOGSTASH-1684)
  regen
  Add racc gem for rbx (since it doesn't ship with it)
  Fix markdown syntax (LOGSTASH-1684)
  Force the default string encoding to be UTF-8.
  - Add 'protocol' setting to allow users to use the 'Transport' client in elasticsearch. (LOGSTASH-102) - Add 'bind_port' setting to allow users with the default node protocol to choose what local port is used. (LOGSTASH-1453)
  [rabbitmq] Switch to March Hare 2.0
  Raise configuration error when invalid rates are set
  Flush only selected rates for meter metrics
  Split rate and percentiles spec tests
  Better spec context names
  Make metric filter's rate and percentiles configurable
  replace commet, because it copy from split filter,;-)
  add punct filter
  [packaging] adapt previous patchset to new .VERSION.mk
  [packaging] depend on default-jre-headless
  [packaging] install only one copy of logrotate.conf
  [packaging] minor RPM improvements
  [packaging] flag files in /etc as configfiles
  ...

Conflicts:
	lib/logstash/outputs/elasticsearch.rb
Merging additions for node protocol.