You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/04/18 08:00:55 UTC
[8/8] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-7708
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-7708
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35e11074
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35e11074
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35e11074
Branch: refs/heads/ignite-7708
Commit: 35e110747b0651b977eb2fd609a4281381aa0046
Parents: dd18bb3 ced5d27
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Apr 18 11:00:36 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Apr 18 11:00:36 2018 +0300
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 8 +-
.../processors/cache/GridCacheAdapter.java | 3 +-
...arOptimisticSerializableTxPrepareFuture.java | 2 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 2 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 +-
.../near/GridNearTxFastFinishFuture.java | 10 +-
.../cache/distributed/near/GridNearTxLocal.java | 57 ++++++----
.../cache/transactions/IgniteTxManager.java | 5 +-
.../IgniteClientReconnectCacheTest.java | 6 --
.../transactions/TxRollbackOnTimeoutTest.java | 2 +
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 6 +-
modules/sqlline/bin/sqlline.sh | 7 +-
.../generator/ConfigurationGenerator.js | 106 +++++++++----------
.../frontend/public/stylesheets/style.scss | 10 ++
modules/web-console/frontend/views/index.pug | 2 +-
15 files changed, 132 insertions(+), 96 deletions(-)
----------------------------------------------------------------------