Merge branch 'master' into USERGRID-872
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/668a8012 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/668a8012 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/668a8012 Branch: refs/heads/master Commit: 668a80127001d917482e035bb999bea2a8f41da1 Parents: c8ff102 ee4d504 Author: Dave Johnson <[email protected]> Authored: Tue Nov 24 16:27:02 2015 -0500 Committer: Dave Johnson <[email protected]> Committed: Tue Nov 24 16:27:02 2015 -0500 ---------------------------------------------------------------------- .../asyncevents/EventBuilderImpl.java | 47 ++-- .../usergrid/persistence/graph/GraphFig.java | 2 +- .../impl/EdgeSerializationImpl.java | 61 ++++- .../shard/impl/EdgeShardSerializationImpl.java | 3 +- .../shard/impl/NodeShardAllocationImpl.java | 11 +- .../shard/impl/ShardGroupColumnIterator.java | 4 +- .../shard/impl/ShardGroupCompactionImpl.java | 5 +- .../impl/shard/impl/ShardGroupDeletionImpl.java | 174 +++++++------ .../graph/GraphManagerShardConsistencyIT.java | 40 +-- .../impl/shard/EdgeShardSerializationTest.java | 44 ++++ .../impl/shard/NodeShardAllocationTest.java | 6 +- .../impl/shard/ShardEntryGroupTest.java | 31 +++ .../serialization/impl/shard/ShardTest.java | 65 +++++ .../model/entity/MapToEntityConverter.java | 7 +- .../applications/ApplicationResourceIT.java | 33 ++- .../collection/groups/GroupResourceIT.java | 115 ++++++--- .../usergrid/rest/management/AdminUsersIT.java | 254 +++++++++++-------- 17 files changed, 597 insertions(+), 305 deletions(-) ----------------------------------------------------------------------
