usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [05/12] git commit: Merge branch 'two-dot-o' into two-dot-o-rebuildable-index
Date Thu, 02 Oct 2014 04:12:14 GMT
Merge branch 'two-dot-o' into two-dot-o-rebuildable-index


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3df5d4d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3df5d4d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3df5d4d2

Branch: refs/heads/two-dot-o
Commit: 3df5d4d25b83e39dfd1fbe0919bc68d3d84ed821
Parents: 1aa04a7 abbd76e
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Wed Oct 1 10:51:03 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Wed Oct 1 10:51:03 2014 -0400

----------------------------------------------------------------------
 portal/js/global/ug-service.js                  |  10 +-
 .../corepersistence/CpEntityManager.java        |   3 +-
 .../corepersistence/CpRelationManager.java      |   6 +-
 .../usergrid/mq/cassandra/QueueManagerImpl.java |  18 +-
 .../mq/cassandra/io/AbstractSearch.java         | 208 +++++++++++--------
 .../mq/cassandra/io/ConsumerTransaction.java    |  19 +-
 .../persistence/PerformanceEntityReadTest.java  |   2 +
 .../persistence/PerformanceEntityWriteTest.java |   2 +
 .../index/impl/EsEntityIndexImpl.java           |  52 ++++-
 .../persistence/index/impl/EsQueryVistor.java   |  45 ++--
 .../java/org/apache/usergrid/rest/BasicIT.java  |  34 ++-
 .../notifications/ApplicationQueueManager.java  |  40 ++--
 .../notifications/NotificationsService.java     |   7 +-
 .../notifications/NotificationsTaskManager.java |  33 ---
 .../services/notifications/QueueListener.java   |  64 +++---
 .../services/notifications/QueueManager.java    |   4 -
 .../notifications/SingleQueueTaskManager.java   |  10 +-
 .../services/notifications/TaskTracker.java     |   4 +-
 .../resources/usergrid-services-context.xml     |   9 +-
 .../apns/NotificationsServiceIT.java            |   6 +-
 .../gcm/NotificationsServiceIT.java             |   9 +-
 21 files changed, 342 insertions(+), 243 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3df5d4d2/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3df5d4d2/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------


Mime
View raw message