You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@usergrid.apache.org by to...@apache.org on 2014/09/30 19:01:49 UTC

[6/6] git commit: Merge branch 'two-dot-o' into eventsystem

Merge branch 'two-dot-o' 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/1a416245
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1a416245
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1a416245

Branch: refs/heads/eventsystem
Commit: 1a4162459ae8c31a489937d8a5d2f76f5ca6c2e2
Parents: 429b12b d6fd7dd
Author: Todd Nine <to...@apache.org>
Authored: Tue Sep 30 10:25:44 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Tue Sep 30 10:25:44 2014 -0600

----------------------------------------------------------------------
 .../corepersistence/CpRelationManager.java      |  6 ++--
 .../index/impl/EsEntityIndexImpl.java           | 13 ++++++++
 .../persistence/index/impl/EsQueryVistor.java   |  3 +-
 .../java/org/apache/usergrid/rest/BasicIT.java  | 34 ++++++++++++++------
 .../notifications/ApplicationQueueManager.java  |  2 +-
 .../services/notifications/QueueListener.java   |  6 ++--
 6 files changed, 48 insertions(+), 16 deletions(-)
----------------------------------------------------------------------