Merge branches 'ignite-gg-10134' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10134
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fcc29917 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fcc29917 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fcc29917 Branch: refs/heads/ignite-794 Commit: fcc2991742a220816d72817d94dcadee1504f566 Parents: 4ec4a48 0a173f4 Author: Andrey <anovi...@gridgain.com> Authored: Fri Apr 24 14:17:16 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Fri Apr 24 14:17:16 2015 +0700 ---------------------------------------------------------------------- .../affinity/GridAffinityAssignmentCache.java | 4 +-- .../portable/GridPortableInputStream.java | 26 -------------------- .../visor/node/VisorNodeDataCollectorJob.java | 15 +++-------- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- 4 files changed, 6 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
