You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/03/04 14:49:05 UTC

[ignite] 01/01: Merge branch 'master' into ignite-11461-java11

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch ignite-11461-java11
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit f0f5e417b579d7ea5f421ad62f3acb2fff7a81a9
Merge: 4c25f10 6008a0a
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon Mar 4 17:48:42 2019 +0300

    Merge branch 'master' into ignite-11461-java11

 .../processors/cache/GridCacheProcessor.java       |   7 +
 .../near/GridNearTxAbstractEnlistFuture.java       |  13 ++
 .../internal/util/future/GridFutureAdapter.java    |   4 +-
 .../encryption/keystore/KeystoreEncryptionSpi.java |   4 +-
 .../GridCacheMixedPartitionExchangeSelfTest.java   |  10 +-
 .../GridCacheMvccMultiThreadedUpdateSelfTest.java  |  49 ++++--
 ...OffHeapMultiThreadedUpdateAbstractSelfTest.java |  23 ++-
 .../cache/IgniteClientCacheStartFailoverTest.java  |   5 +-
 .../IgniteMvccTxMultiThreadedAbstractTest.java     |   7 -
 .../processors/cache/IgniteTxAbstractTest.java     |   8 +-
 .../cache/IgniteTxExceptionAbstractSelfTest.java   |  32 +---
 ...WriteSynchronizationModesMultithreadedTest.java |  29 ++--
 .../dht/GridCacheColocatedTxExceptionSelfTest.java |  58 -------
 ...achePartitionedMvccTxMultiThreadedSelfTest.java |  12 +-
 ...CacheReplicatedMvccTxMultiThreadedSelfTest.java |   4 +-
 .../GridCacheReplicatedTxExceptionSelfTest.java    |  58 -------
 .../cache/mvcc/CacheMvccTransactionsTest.java      | 178 ++-------------------
 .../cache/transactions/TxRollbackAsyncTest.java    |   4 +-
 .../ignite/testframework/MvccFeatureChecker.java   |   1 -
 ...ransactionsCommandsWithMvccEnabledSelfTest.java |   2 +-
 .../mvcc/CacheMvccPartitionedSqlQueriesTest.java   |   2 +-
 .../mvcc/CacheMvccReplicatedSqlQueriesTest.java    |   2 +-
 .../mvcc/CacheMvccSqlQueriesAbstractTest.java      |  99 ++++++------
 .../mvcc/CacheMvccSqlTxQueriesAbstractTest.java    |  68 ++++----
 .../cache/mvcc/MvccDeadlockDetectionTest.java      |   4 +-
 .../processors/query/h2/QueryDataPageScanTest.java |   5 +-
 26 files changed, 239 insertions(+), 449 deletions(-)