Merge remote-tracking branch 'remotes/origin/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/49a0e6da Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49a0e6da Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49a0e6da Branch: refs/heads/ignite-2265 Commit: 49a0e6dab31cb64d361bf0539c5a99d05bd6e1d6 Parents: 9c27ecb 3b26859 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Tue Dec 8 11:34:10 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Tue Dec 8 11:34:10 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 34 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 51 +- .../cache/transactions/IgniteTxAdapter.java | 5 + .../cache/transactions/IgniteTxEntry.java | 8 +- .../optimized/OptimizedMarshallerUtils.java | 16 +- .../IgniteCacheEntryProcessorCallTest.java | 497 +++++++++++++++++++ ...idCachePartitionedHitsAndMissesSelfTest.java | 4 +- .../testframework/junits/GridAbstractTest.java | 7 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + ...cheDuplicateEntityConfigurationSelfTest.java | 126 +++++ .../IgniteCacheQuerySelfTestSuite.java | 4 + .../Apache.Ignite.Core.Tests/EventsTest.cs | 3 +- .../apache/ignite/yarn/utils/package-info.java | 22 + 13 files changed, 754 insertions(+), 25 deletions(-) ----------------------------------------------------------------------