Return-Path: X-Original-To: apmail-streams-commits-archive@minotaur.apache.org Delivered-To: apmail-streams-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D80F11E8F for ; Wed, 17 Sep 2014 21:59:28 +0000 (UTC) Received: (qmail 56374 invoked by uid 500); 17 Sep 2014 21:59:28 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 56356 invoked by uid 500); 17 Sep 2014 21:59:28 -0000 Mailing-List: contact commits-help@streams.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@streams.incubator.apache.org Delivered-To: mailing list commits@streams.incubator.apache.org Received: (qmail 56347 invoked by uid 99); 17 Sep 2014 21:59:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 21:59:28 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 17 Sep 2014 21:59:27 +0000 Received: (qmail 56190 invoked by uid 99); 17 Sep 2014 21:59:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 21:59:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EF904A19A2E; Wed, 17 Sep 2014 21:59:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sblackmon@apache.org To: commits@streams.incubator.apache.org Date: Wed, 17 Sep 2014 21:59:06 -0000 Message-Id: <238d0a68eff24cee8589fe784c6ca268@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Merge branch 'STREAMS-164' X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-streams Updated Branches: refs/heads/STREAMS-177 [created] dc5e7de3c Merge branch 'STREAMS-164' Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b4d71241 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b4d71241 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b4d71241 Branch: refs/heads/STREAMS-177 Commit: b4d71241b36806ddc02ffaa90892dbf4e93f254f Parents: 35a8fbf 5bf8755 Author: sblackmon Authored: Wed Sep 17 16:44:46 2014 -0500 Committer: sblackmon Committed: Wed Sep 17 16:44:46 2014 -0500 ---------------------------------------------------------------------- .../ElasticsearchConfigurator.java | 41 ++++------- .../ElasticsearchPersistDeleter.java | 34 +++++---- .../ElasticsearchPersistUpdater.java | 66 +++++------------ .../ElasticsearchPersistWriter.java | 76 +++++++++++++------- 4 files changed, 98 insertions(+), 119 deletions(-) ----------------------------------------------------------------------