Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-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 6E5C217390 for ; Wed, 1 Oct 2014 16:32:06 +0000 (UTC) Received: (qmail 98456 invoked by uid 500); 1 Oct 2014 16:32:06 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 98416 invoked by uid 500); 1 Oct 2014 16:32:06 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 98168 invoked by uid 99); 1 Oct 2014 16:32:06 -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, 01 Oct 2014 16:32:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EFFFB925344; Wed, 1 Oct 2014 16:32:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Date: Wed, 01 Oct 2014 16:32:18 -0000 Message-Id: <804b6e9da1244bddb5eb3be21c3eae3c@git.apache.org> In-Reply-To: <814f23fa00044af7a796e3a671b301b1@git.apache.org> References: <814f23fa00044af7a796e3a671b301b1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/15] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into eventsystem Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into eventsystem Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d85b97c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d85b97c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d85b97c4 Branch: refs/heads/two-dot-o Commit: d85b97c423f31afda0e846a9071e03efe0505d26 Parents: 8cadba2 abbd76e Author: Todd Nine Authored: Wed Oct 1 10:30:54 2014 -0600 Committer: Todd Nine Committed: Wed Oct 1 10:30:54 2014 -0600 ---------------------------------------------------------------------- .../usergrid/mq/cassandra/QueueManagerImpl.java | 18 +- .../mq/cassandra/io/AbstractSearch.java | 199 ++++++++++++------- .../mq/cassandra/io/ConsumerTransaction.java | 19 +- .../services/notifications/QueueListener.java | 4 +- 4 files changed, 153 insertions(+), 87 deletions(-) ----------------------------------------------------------------------