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 2015/09/11 03:27:43 UTC
[12/50] 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/d9529fbb
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d9529fbb
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d9529fbb
Branch: refs/heads/USERGRID-909
Commit: d9529fbbc8edcfb799f3379cdb8716bbbcc132d9
Parents: 882aa3a 2e681b7
Author: Michael Russo <mi...@gmail.com>
Authored: Tue Sep 1 15:32:03 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Tue Sep 1 15:32:03 2015 -0700
----------------------------------------------------------------------
.../service/AggregationService.java | 10 +--
.../service/AggregationServiceImpl.java | 13 ++-
.../apache/usergrid/count/SimpleBatcher.java | 2 +-
.../corepersistence/AggregationServiceTest.java | 14 +--
.../applications/ApplicationResource.java | 36 ++++++--
.../rest/management/ManagementResourceIT.java | 16 ++--
.../usergrid/management/ManagementService.java | 2 +
.../cassandra/ManagementServiceImpl.java | 91 +++++++++++---------
8 files changed, 107 insertions(+), 77 deletions(-)
----------------------------------------------------------------------