Auto-merge | Integrating 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/e965b699 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e965b699 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e965b699 Branch: refs/heads/REDBULL-1604 Commit: e965b6996a4f50b81333ad3392a3fb34d65b94f0 Parents: 2c4a795 b4d7124 Author: W2O Deployer <[email protected]> Authored: Wed Sep 17 18:06:57 2014 -0400 Committer: W2O Deployer <[email protected]> Committed: Wed Sep 17 18:06:57 2014 -0400 ---------------------------------------------------------------------- .../ElasticsearchConfigurator.java | 41 ++++------- .../ElasticsearchPersistDeleter.java | 34 +++++---- .../ElasticsearchPersistUpdater.java | 66 +++++------------ .../ElasticsearchPersistWriter.java | 76 +++++++++++++------- 4 files changed, 98 insertions(+), 119 deletions(-) ----------------------------------------------------------------------
