You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/10/28 12:17:41 UTC

[10/20] ignite git commit: Merge remote-tracking branch 'community/ignite-1.6.10' into ignite-1.6.10

Merge remote-tracking branch 'community/ignite-1.6.10' into ignite-1.6.10


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

Branch: refs/heads/ignite-4111
Commit: e6430bdf14e457e7497bf6e84013747f06f71fc3
Parents: ccae52c 4edcf12
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Tue Oct 18 15:01:41 2016 +0500
Committer: tledkov-gridgain <tl...@gridgain.com>
Committed: Tue Oct 18 15:01:41 2016 +0500

----------------------------------------------------------------------
 .../configuration/IgniteConfiguration.java      | 31 -------
 .../ignite/internal/GridKernalContext.java      |  7 --
 .../ignite/internal/GridKernalContextImpl.java  | 12 ---
 .../apache/ignite/internal/IgniteKernal.java    |  3 -
 .../org/apache/ignite/internal/IgnitionEx.java  | 20 +---
 .../managers/communication/GridIoManager.java   |  2 -
 .../managers/communication/GridIoPolicy.java    |  3 -
 .../closure/GridClosureProcessor.java           |  3 +-
 .../datastreamer/DataStreamProcessor.java       | 82 ++---------------
 .../datastreamer/DataStreamerImpl.java          | 31 ++++++-
 .../internal/processors/pool/PoolProcessor.java |  3 -
 .../twostep/messages/GridQueryFailResponse.java | 10 +-
 .../DataStreamProcessorSelfTest.java            | 97 --------------------
 .../junits/GridTestKernalContext.java           | 12 +--
 ...butedQueryStopOnCancelOrTimeoutSelfTest.java |  2 +-
 modules/platforms/cpp/common/Makefile.am        |  4 +-
 .../common/include/ignite/common/concurrent.h   |  5 +-
 .../cpp/common/include/ignite/ignite_error.h    |  4 +-
 .../platforms/cpp/common/src/ignite_error.cpp   |  4 +-
 modules/platforms/cpp/core-test/Makefile.am     | 10 +-
 .../cpp/core-test/src/decimal_test.cpp          |  2 +-
 .../cpp/core-test/src/interop_memory_test.cpp   |  5 +-
 modules/platforms/cpp/jni/src/java.cpp          |  2 +-
 modules/platforms/cpp/odbc-test/Makefile.am     |  4 +-
 .../cpp/odbc-test/src/queries_test.cpp          |  4 +-
 .../cpp/odbc/src/config/configuration.cpp       |  2 +-
 26 files changed, 77 insertions(+), 287 deletions(-)
----------------------------------------------------------------------