usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [2/3] git commit: Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Date Fri, 25 Jul 2014 16:47:23 GMT
Merge branch 'two-dot-o' of github.com:apache/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/49ab6d26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/49ab6d26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/49ab6d26

Branch: refs/heads/two-dot-o
Commit: 49ab6d260e087c815a5d734a8c1d7b2b756e8813
Parents: d33812a 54f045f
Author: Todd Nine <tnine@apigee.com>
Authored: Wed Jul 23 10:43:02 2014 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Wed Jul 23 10:43:02 2014 -0600

----------------------------------------------------------------------
 .../main/resources/usergrid-default.properties  | 78 +++++++++++-------
 stack/core/pom.xml                              | 86 +++++++++++++++-----
 .../usergrid/persistence/PathQueryIT.java       |  2 +-
 .../query/AbstractIteratingQueryIT.java         | 10 ++-
 .../src/test/resources/dynamic-test.properties  | 21 -----
 .../src/test/resources/usergrid-CHOP.properties | 17 ++++
 .../shard/count/NodeShardApproximationImpl.java |  9 +-
 .../impl/shard/NodeShardAllocationTest.java     |  3 +-
 .../impl/shard/NodeShardCacheTest.java          |  4 +
 .../shard/count/NodeShardApproximationTest.java |  3 +
 .../cassandra/ManagementServiceImpl.java        | 39 ++++-----
 .../services/AbstractCollectionService.java     |  2 +-
 12 files changed, 169 insertions(+), 105 deletions(-)
----------------------------------------------------------------------



Mime
View raw message