Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a85c1195 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a85c1195 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a85c1195 Branch: refs/heads/master Commit: a85c1195336a8c78c8e0d08d27dc429a881e3bc1 Parents: 8e7e291 e1cf37f Author: Mark Payne <[email protected]> Authored: Fri Mar 11 12:55:23 2016 -0500 Committer: Mark Payne <[email protected]> Committed: Fri Mar 11 12:55:23 2016 -0500 ---------------------------------------------------------------------- .../elasticsearch/PutElasticsearch.java | 42 +++++++++++--------- .../elasticsearch/TestPutElasticsearch.java | 20 ++++++++++ 2 files changed, 44 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
