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/29 22:52:57 UTC
[18/52] [abbrv] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/09118447
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/09118447
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/09118447
Branch: refs/heads/eventsystem
Commit: 091184472cc419a29420234a11abdb93e81b5b37
Parents: d20a6e0 dc3e36c
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Sep 25 12:00:58 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Sep 25 12:00:58 2014 -0400
----------------------------------------------------------------------
portal/js/global/ug-service.js | 1098 +++--
portal/js/libs/usergrid.sdk.js | 4264 +++++++++---------
.../index/impl/EsEntityIndexImpl.java | 36 +-
.../services/notifications/QueueListener.java | 15 +-
.../notifications/SingleQueueTaskManager.java | 2 +-
5 files changed, 2818 insertions(+), 2597 deletions(-)
----------------------------------------------------------------------