Merge remote-tracking branch 'origin/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/18fef56c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18fef56c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18fef56c Branch: refs/heads/ignite-1.5 Commit: 18fef56c2036b1d6fba8792522ea79d827e65aac Parents: 09c9a0b d2008c5 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 10 13:24:30 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 10 13:24:30 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 2 +- .../portable/PortableClassDescriptor.java | 14 +- .../portable/BinaryMarshallerSelfTest.java | 198 +++++++++++++++++++ .../GridPortableAffinityKeySelfTest.java | 2 +- ...CacheClientNodeBinaryObjectMetadataTest.java | 2 +- ...ridCacheAffinityRoutingPortableSelfTest.java | 2 +- 6 files changed, 211 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
