Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eebf9c1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eebf9c1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eebf9c1c Branch: refs/heads/ignite-843 Commit: eebf9c1c7fa07b442e4a341ffa2b5ce2828032c4 Parents: ed43dfe fffc2ec Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Jun 18 09:43:45 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Jun 18 09:43:45 2015 +0300 ---------------------------------------------------------------------- .../dht/GridDhtPartitionTopologyImpl.java | 4 +++- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 19 ++++++++++--------- .../junits/common/GridCommonAbstractTest.java | 8 ++++++-- 3 files changed, 19 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
