Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc85fe3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc85fe3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc85fe3b Branch: refs/heads/ignite-1537 Commit: dc85fe3b636a7011a6c4438ed571a3a9a665f9e2 Parents: 5da19c7 18fef56 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 10 13:26:49 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 10 13:26:49 2015 +0300 ---------------------------------------------------------------------- .../portable/PortableClassDescriptor.java | 14 +- .../processors/cache/GridCacheIoManager.java | 5 +- .../processors/cache/GridCacheProcessor.java | 17 ++ .../portable/BinaryMarshallerSelfTest.java | 198 +++++++++++++++++++ 4 files changed, 228 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
