Merge remote-tracking branch 'apache/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ae17094 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ae17094 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ae17094 Branch: refs/heads/ignite-1270 Commit: 2ae17094f58b4bfafd006dc2fc14bf9c0a6f8abc Parents: fa7a4bc 59fc24f Author: ashutak <[email protected]> Authored: Mon Nov 23 16:27:01 2015 +0300 Committer: ashutak <[email protected]> Committed: Mon Nov 23 16:27:01 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 3 ++- .../GridCachePartitionedAtomicSetFailoverSelfTest.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
