Merge branch 'ignite-1.3.3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1159
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d45c2ce3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d45c2ce3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d45c2ce3 Branch: refs/heads/ignite-1159 Commit: d45c2ce33f427d5e470ca34cc358271cfdb07879 Parents: bc18024 fdb493e Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Jul 28 17:00:02 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Jul 28 17:00:02 2015 -0700 ---------------------------------------------------------------------- .../store/jdbc/CacheAbstractJdbcStore.java | 21 ++++- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 26 ++++++ .../managers/communication/GridIoManager.java | 84 +++++++++++++++++++- .../processors/cache/GridCacheSwapManager.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../src/test/config/io-manager-benchmark.xml | 3 +- 7 files changed, 130 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d45c2ce3/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d45c2ce3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ----------------------------------------------------------------------
