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 E2A4E172AE for ; Thu, 10 Sep 2015 20:56:50 +0000 (UTC) Received: (qmail 20279 invoked by uid 500); 10 Sep 2015 20:56:50 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 20195 invoked by uid 500); 10 Sep 2015 20:56:50 -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 20181 invoked by uid 99); 10 Sep 2015 20:56:50 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Sep 2015 20:56:50 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 3E4CA1A0CEC for ; Thu, 10 Sep 2015 20:56:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.774 X-Spam-Level: * X-Spam-Status: No, score=1.774 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id BwD3HRcIm45J for ; Thu, 10 Sep 2015 20:56:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A09C920F9F for ; Thu, 10 Sep 2015 20:56:48 +0000 (UTC) Received: (qmail 19968 invoked by uid 99); 10 Sep 2015 20:56:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Sep 2015 20:56:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BA7AEE0FBF; Thu, 10 Sep 2015 20:56:47 +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: Thu, 10 Sep 2015 20:56:48 -0000 Message-Id: <13863d49b23a4fe1b559a41bb8a7e07d@git.apache.org> In-Reply-To: <92415a8251c34f10ab0c6bf1d6bf06aa@git.apache.org> References: <92415a8251c34f10ab0c6bf1d6bf06aa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-streams git commit: Merge branch 'STREAMS-358' Merge branch 'STREAMS-358' * STREAMS-358: resolves STREAMS-358 now you have to explicitly ask for a refresh for a refresh to occur Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/fbd07411 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/fbd07411 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/fbd07411 Branch: refs/heads/master Commit: fbd07411ea47e2d955c46f96d464e0a76f302b6a Parents: 6522ef4 193151f Author: Steve Blackmon (@steveblackmon) Authored: Thu Sep 10 14:11:38 2015 -0500 Committer: Steve Blackmon (@steveblackmon) Committed: Thu Sep 10 14:11:38 2015 -0500 ---------------------------------------------------------------------- .../ElasticsearchPersistWriter.java | 63 ++++++++++++-------- .../elasticsearch/ElasticsearchQuery.java | 6 +- .../ElasticsearchWriterConfiguration.json | 7 ++- 3 files changed, 48 insertions(+), 28 deletions(-) ----------------------------------------------------------------------