Merge branch 'ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/101be8af Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/101be8af Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/101be8af Branch: refs/heads/ignite-1093-2 Commit: 101be8afe4edfa48ffcbf29b5536160e45369647 Parents: 72e9973 071586e Author: vozerov-gridgain <[email protected]> Authored: Thu Sep 10 15:01:56 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Sep 10 15:01:56 2015 +0300 ---------------------------------------------------------------------- examples/config/platform/cpp/example-cache.xml | 87 --------- .../configuration/CacheConfiguration.java | 41 +--- .../ignite/configuration/TopologyValidator.java | 24 ++- .../internal/portable/PortableReaderExImpl.java | 3 - ...idPortableMarshallerCtxDisabledSelfTest.java | 168 ++++++++++++++-- .../GridPortableMarshallerSelfTest.java | 1 - ...dCachePartitionedQueueEntryMoveSelfTest.java | 191 +++++++------------ 7 files changed, 239 insertions(+), 276 deletions(-) ----------------------------------------------------------------------
