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 2017/06/14 11:46:25 UTC
[5/6] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5272
Merge remote-tracking branch 'remotes/origin/master' into ignite-5272
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/896cb3c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/896cb3c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/896cb3c0
Branch: refs/heads/ignite-5272
Commit: 896cb3c030f236c839454ba6f2a6a5443aca26e3
Parents: 791088d 9b3987d
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jun 14 11:10:47 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jun 14 11:10:47 2017 +0300
----------------------------------------------------------------------
.../configuration/ExecutorConfiguration.java | 4 +-
.../CacheDataStructuresCacheKey.java | 64 ----
.../CacheDataStructuresConfigurationKey.java | 64 ----
.../datastructures/DataStructureInfoKey.java | 56 +++
.../datastructures/DataStructuresCacheKey.java | 42 +++
.../datastructures/DataStructuresProcessor.java | 373 +++----------------
.../cpp/odbc-test/src/queries_test.cpp | 31 ++
.../cpp/odbc/include/ignite/odbc/statement.h | 13 +-
modules/platforms/cpp/odbc/src/odbc.cpp | 7 +-
modules/platforms/cpp/odbc/src/statement.cpp | 33 +-
.../Examples/ExamplesTest.cs | 13 +-
.../NuGet/LINQPad/BinaryModeExample.linq | 1 +
.../NuGet/LINQPad/ComputeExample.linq | 17 +-
.../NuGet/LINQPad/PutGetExample.linq | 1 +
.../NuGet/LINQPad/QueryExample.linq | 1 +
.../NuGet/LINQPad/QueryExample.linq | 1 +
.../Apache.Ignite.Examples.csproj | 1 +
.../examples/Apache.Ignite.Examples/App.config | 3 +-
.../Compute/PeerAssemblyLoadingExample.cs | 96 +++++
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../states/configuration/clusters/thread.pug | 2 +-
22 files changed, 370 insertions(+), 461 deletions(-)
----------------------------------------------------------------------