Merge branch 'ignite-classname' 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/2b81104a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b81104a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b81104a Branch: refs/heads/ignite-gg-10411 Commit: 2b81104aaee4c39260dbd276405ef9f477c90f30 Parents: 2b7a18d e17a2be Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Jun 12 17:16:43 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Jun 12 17:16:43 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(-) ----------------------------------------------------------------------
