Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3b5395c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3b5395c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3b5395c Branch: refs/heads/ignite-4587 Commit: b3b5395c826ab1f581dda37e99c815349274f273 Parents: eac7861 52712ff Author: devozerov <[email protected]> Authored: Fri Apr 14 12:50:15 2017 +0300 Committer: devozerov <[email protected]> Committed: Fri Apr 14 12:50:15 2017 +0300 ---------------------------------------------------------------------- .../cache/affinity/AffinityKeyMapped.java | 14 ++--- .../GridCacheDefaultAffinityKeyMapper.java | 38 +------------- .../datastructures/DataStructuresProcessor.java | 1 - .../datastructures/GridCacheQueueAdapter.java | 49 ++---------------- .../datastructures/GridCacheSetImpl.java | 54 +------------------- .../internal/GridMultipleJobsSelfTest.java | 12 ++--- .../GridCacheConcurrentTxMultiNodeTest.java | 9 +++- .../loadtests/colocation/GridTestKey.java | 28 ++++++++-- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 7 ++- 9 files changed, 56 insertions(+), 156 deletions(-) ----------------------------------------------------------------------
