Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-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 DCF511834A for ; Mon, 1 Feb 2016 17:49:03 +0000 (UTC) Received: (qmail 58711 invoked by uid 500); 1 Feb 2016 17:48:48 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 58628 invoked by uid 500); 1 Feb 2016 17:48:48 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 57862 invoked by uid 99); 1 Feb 2016 17:48:48 -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; Mon, 01 Feb 2016 17:48:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08D61E383A; Mon, 1 Feb 2016 17:48:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Mon, 01 Feb 2016 17:49:03 -0000 Message-Id: <2670713e34954937829603924551c9bc@git.apache.org> In-Reply-To: <1a18c9aa747f4e9e8f7ed70bc5a7aa7f@git.apache.org> References: <1a18c9aa747f4e9e8f7ed70bc5a7aa7f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] brooklyn-server git commit: Merge pull request #652 from aledsage/fix/HttpFeed-reuses-polls Merge pull request #652 from aledsage/fix/HttpFeed-reuses-polls Fix HttpFeed so again reuses polls Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8df88525 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8df88525 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8df88525 Branch: refs/heads/0.5.0 Commit: 8df88525547252b600e44a9ba1519641b1022db2 Parents: e5d2185 0ea1a02 Author: Peter Veentjer Authored: Tue Apr 16 22:21:19 2013 -0700 Committer: Peter Veentjer Committed: Tue Apr 16 22:21:19 2013 -0700 ---------------------------------------------------------------------- .../java/brooklyn/event/feed/http/HttpFeed.java | 6 +-- .../brooklyn/event/feed/http/HttpFeedTest.java | 39 +++++++++++++++++++- 2 files changed, 41 insertions(+), 4 deletions(-) ----------------------------------------------------------------------