actually encode to UTF-8 when input charset is non UTF-8 + basic specs
explicit return for explicit explicitness
    Fix bug LOGSTASH-1225 "Cannot Clone Fixnum"

    The clone {} filter will throw an exception if any of the values in the
    event map are numbers. Problem is that numbers are not clonable.

    This is a single-line fix that wraps the .clone call in a try block and
    does a simple set-by-value if the clone raises an exception.

    Included under spec/filters/clone.rb is a test case that fails without
    the change in lib/logstash/event.rb and passes with the fix applied.
Fix event::overwrite to copy timestamp properly
updates as per code review
Merge pull request #1161 from rtkmhart/master

Fix event::overwrite to copy timestamp properly
Actually clear GEM_PATH

This helps ensure we provide only our own gem directory for rubygems.

Helps improve LOGSTASH-1918. Before this patch, my local ruby install
was accidentally providing 'rack' so I never noticed this problem.
Add 'rack' gem back in

This is required for 'logstash web' to serve Kibana and was
removed accidentally.

This fixes LOGSTASH-1918
Add test coverage for LOGSTASH-1918
Merge pull request #1164 from jordansissel/LOGSTASH-1918

Add missing 'rack' gem
Add sinatra gem. This was accidentally removed in a previous commit.

This fixes 'bin/logstash web' to run correctly (was broken in an earlier
1.4.0 beta)
Merge pull request #1165 from jordansissel/web-fixes

Add sinatra gem. This was accidentally removed in a previous commit.
- bump lumberjack version
Merge pull request #1158 from darren-fhf/master

    Fix bug LOGSTASH-1225 "Cannot Clone Fixnum"
Merge pull request #1166 from jordansissel/bump-lumberjack

bump lumberjack version
Add missing 'require "socket"'

Audited files using 'Socket.gethostname' but didn't require "socket"
using the following command:

    ack -L 'require "socket"' $(ack -l 'Socket.gethostname' lib)

Fixes LOGSTASH-1974
Merge pull request #1167 from jordansissel/fix-missing-requires

Add missing 'require "socket"'
actually encode to UTF-8 when input charset is non UTF-8 + basic specs
explicit return for explicit explicitness
Merge branch 'charset_fix' of https://github.com/colinsurprenant/logstash into colinsurprenant-charset_fix

Conflicts:
	Makefile