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/11/11 08:22:33 UTC
[4/4] ignite git commit: Merge branch 'ignite-4154' into
ignite-4154-opt2
Merge branch 'ignite-4154' into ignite-4154-opt2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4895794
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4895794
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4895794
Branch: refs/heads/ignite-4154-opt2
Commit: c4895794057e7d82e1a0958c4ff35c6709e79331
Parents: fb919d0 5a0a9f4
Author: sboikov <sb...@gridgain.com>
Authored: Fri Nov 11 11:21:45 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Nov 11 11:21:45 2016 +0300
----------------------------------------------------------------------
.../IgniteNoCustomEventsOnNodeStart.java | 7 +
.../junits/common/GridCommonAbstractTest.java | 14 ++
.../cache/IgniteCacheOffheapEvictQueryTest.java | 7 +
...lientQueryReplicatedNodeRestartSelfTest.java | 7 +
...butedQueryStopOnCancelOrTimeoutSelfTest.java | 7 +
modules/platforms/cpp/DEVNOTES.txt | 12 ++
.../platforms/cpp/odbc-test/include/test_type.h | 42 ++++--
.../cpp/odbc-test/src/queries_test.cpp | 139 +++++++++++++++++--
.../cpp/odbc-test/src/sql_outer_join_test.cpp | 2 +-
modules/platforms/cpp/odbc/README.txt | 23 +--
.../cpp/odbc/install/ignite-odbc-amd64.wxs | 114 +++++++++++++++
.../cpp/odbc/install/ignite-odbc-x86.wxs | 114 +++++++++++++++
.../odbc/src/app/application_data_buffer.cpp | 34 ++++-
.../src/test/config/incorrect-store-cache.xml | 2 +
.../src/test/config/jdbc-pojo-store-builtin.xml | 3 +
.../src/test/config/jdbc-pojo-store-obj.xml | 3 +
modules/spring/src/test/config/node.xml | 2 +
modules/spring/src/test/config/node1.xml | 2 +
.../test/config/pojo-incorrect-store-cache.xml | 2 +
modules/spring/src/test/config/store-cache.xml | 2 +
modules/spring/src/test/config/store-cache1.xml | 2 +
pom.xml | 8 ++
22 files changed, 510 insertions(+), 38 deletions(-)
----------------------------------------------------------------------