You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/08/31 22:29:13 UTC
[3/3] usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a566720e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a566720e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a566720e
Branch: refs/heads/two-dot-o-dev
Commit: a566720e951d840902ac7fae8003bdab8b026fff
Parents: f9bc01f 5c46fde
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Aug 31 14:29:04 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Aug 31 14:29:04 2015 -0600
----------------------------------------------------------------------
portal/js/global/page-controller.js | 3 +-
portal/js/global/ug-service.js | 2 +-
portal/js/login/login-controller.js | 5 ++
stack/awscluster/gatling-cluster-cf.json | 2 +-
.../corepersistence/StaleIndexCleanupTest.java | 13 ++--
.../queue/impl/SNSQueueManagerImpl.java | 76 +++++++++-----------
6 files changed, 47 insertions(+), 54 deletions(-)
----------------------------------------------------------------------