Merge branches 'ignite-212' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-212
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4db44624 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4db44624 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4db44624 Branch: refs/heads/sprint-1 Commit: 4db4462482434d791d58239a4708e512a1422524 Parents: 22f42a3 36a4feb Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Feb 16 00:57:55 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Feb 16 00:57:55 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheAffinityExample.java | 4 ++-- .../java/org/apache/ignite/IgniteCache.java | 3 +-- .../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 +- .../p2p/GridAbstractMultinodeRedeployTest.java | 23 ++------------------ .../GridFifoQueueCollisionSpiSelfTest.java | 12 ++++++---- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 ++ 6 files changed, 16 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
