You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/15 19:25:33 UTC
[41/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/ignite-sprint-6' into ignite-sprint-6
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51600881
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51600881
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51600881
Branch: refs/heads/ignite-648-win
Commit: 516008811d416b92011d3a70249a579cf41b1e93
Parents: dd58664 2b81104
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Jun 12 17:21:14 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Jun 12 17:21:14 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContextImpl.java | 5 +++--
.../apache/ignite/internal/IgniteKernal.java | 21 ++++++++++++++++++--
.../internal/MarshallerContextAdapter.java | 18 +++++++++++++++--
.../ignite/internal/MarshallerContextImpl.java | 14 ++++++++++++-
.../GridClientOptimizedMarshaller.java | 5 +++++
.../plugin/IgnitePluginProcessor.java | 16 ++-------------
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 14 +++++++++----
.../marshaller/MarshallerContextTestImpl.java | 18 +++++++++++++++++
.../junits/GridTestKernalContext.java | 1 +
.../ignite/tools/classgen/ClassesGenerator.java | 18 +++++++++++++----
10 files changed, 101 insertions(+), 29 deletions(-)
----------------------------------------------------------------------