- add messages_per_second setting (LOGSTASH-962)
- update changelog
- roll back accidental removal of geoip database
Merge git://github.com/logstash/logstash