Merging changes from apache/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/6146c33f Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/6146c33f Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/6146c33f Branch: refs/heads/REDBULL-1604 Commit: 6146c33fd46bd2f1b3820e6b982a5c9124df6f3e Parents: 7543e08 7404248 Author: mfranklin <mfrank...@apache.org> Authored: Mon Aug 25 13:26:13 2014 -0400 Committer: mfranklin <mfrank...@apache.org> Committed: Mon Aug 25 13:26:13 2014 -0400 ---------------------------------------------------------------------- .../elasticsearch/ElasticsearchWriterConfiguration.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
