Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ccc5aee6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ccc5aee6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ccc5aee6 Branch: refs/heads/ignite-424 Commit: ccc5aee67ec2d7cf360903431cb10071f5e4ba9a Parents: f7f0898 71c6939 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Mar 27 11:01:19 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Mar 27 11:01:19 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 14 ++++- .../internal/MarshallerContextAdapter.java | 5 +- .../ignite/internal/MarshallerContextImpl.java | 65 +++++++++----------- .../discovery/GridDiscoveryManager.java | 7 ++- .../ignite/lang/IgniteProductVersion.java | 2 +- .../ignite/marshaller/MarshallerContext.java | 5 +- .../optimized/OptimizedMarshallerUtils.java | 2 +- .../org/jsr166/ConcurrentLinkedHashMap.java | 9 +++ .../GridProjectionForCachesSelfTest.java | 2 +- .../GridConcurrentLinkedHashMapSelfTest.java | 17 +++++ 10 files changed, 84 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
