You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/09/14 14:41:10 UTC

[10/10] ignite git commit: Merge branch 'master' into ignite-5896

Merge branch 'master' into ignite-5896


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79a8b250
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79a8b250
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79a8b250

Branch: refs/heads/ignite-5896
Commit: 79a8b2503715506a66984a6aad83cd9025d132e0
Parents: d1a04dc e4e0a28
Author: devozerov <pp...@gmail.com>
Authored: Thu Sep 14 17:40:52 2017 +0300
Committer: devozerov <pp...@gmail.com>
Committed: Thu Sep 14 17:40:52 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |  3 +-
 .../processors/cache/GridCacheAdapter.java      | 87 ++++++++++++--------
 .../processors/cache/GridCacheProcessor.java    |  2 +-
 .../odbc/SqlListenerConnectionContext.java      |  6 ++
 .../processors/odbc/SqlListenerNioListener.java |  5 ++
 .../odbc/jdbc/JdbcConnectionContext.java        |  5 ++
 .../odbc/jdbc/JdbcRequestHandler.java           | 20 ++++-
 .../odbc/odbc/OdbcConnectionContext.java        |  5 ++
 .../odbc/odbc/OdbcRequestHandler.java           | 18 ++++
 .../client/ClientConnectionContext.java         |  5 ++
 .../org/apache/ignite/thread/IgniteThread.java  |  2 +-
 ...CacheExchangeMessageDuplicatedStateTest.java | 27 ++++--
 .../cache/ConcurrentCacheStartTest.java         | 71 ++++++++++++++++
 .../MemoryPolicyInitializationTest.java         |  2 +-
 .../testsuites/IgniteCacheTestSuite5.java       |  3 +
 .../H2DynamicColumnsAbstractBasicSelfTest.java  | 23 ++++--
 16 files changed, 229 insertions(+), 55 deletions(-)
----------------------------------------------------------------------