Adding COMMONAPACHELOG format
Update jruby version
Merge pull request #805 from jordansissel/funchanges

Update jruby version
Update jruby version
adding COMMONAPACHELOG
add COMMONAPACHELOG
Merge pull request #806 from kurtado/lsmerge

Adding COMMONAPACHELOG format, which is a subset of COMBINEDAPACHELOG
Merge branch 'master' of https://github.com/logstash/logstash

# By Jordan Sissel (2) and Kurt Hurtado (2)
# Via Jordan Sissel (2) and Kurt Hurtado (2)
* 'master' of https://github.com/logstash/logstash:
  adding COMMONAPACHELOG
  Update jruby version
  Update jruby version
  Adding COMMONAPACHELOG format