You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/16 11:28:49 UTC
[09/10] ignite git commit: Merge branches 'ignite-1.5' and
'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-843-rc2
Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0eb69c61
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0eb69c61
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0eb69c61
Branch: refs/heads/ignite-843-rc2
Commit: 0eb69c614d6b5003f2145f8235fec215e7c612c8
Parents: e497795 490f552
Author: Andrey <an...@gridgain.com>
Authored: Wed Dec 16 17:18:44 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Dec 16 17:18:44 2015 +0700
----------------------------------------------------------------------
.../transactions/IgniteTxLocalAdapter.java | 23 ++-
.../service/GridServiceProcessor.java | 30 ++-
.../CacheSerializableTransactionsTest.java | 8 +
.../GridServiceProcessorProxySelfTest.java | 3 +-
.../ServicePredicateAccessCacheTest.java | 155 ++++++++++++++
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../common/include/ignite/common/concurrent.h | 2 +-
.../cpp/common/include/ignite/common/utils.h | 1 -
.../cpp/common/os/win/src/concurrent_os.cpp | 26 ++-
modules/platforms/cpp/common/src/java.cpp | 20 +-
.../platforms/cpp/core-test/src/cache_test.cpp | 4 +-
modules/platforms/cpp/core/impl/doxygen.h | 53 +++++
.../core/include/ignite/binary/binary_type.h | 4 +-
.../cpp/core/include/ignite/cache/cache.h | 12 +-
.../include/ignite/cache/query/query_scan.h | 28 +--
.../include/ignite/cache/query/query_text.h | 38 ++--
.../cpp/core/include/ignite/ignition.h | 10 +-
.../core/include/ignite/impl/cache/cache_impl.h | 6 +-
.../cpp/core/include/ignite/impl/operations.h | 8 +-
modules/platforms/cpp/cpp.dxg | 4 +-
.../Examples/ExamplesTest.cs | 4 +-
.../Apache.Ignite.Core.csproj | 1 +
.../dotnet/Apache.Ignite.Core/Index.cs | 31 +++
modules/platforms/dotnet/Apache.Ignite.sln | 1 +
.../Apache.Ignite.Examples.csproj | 1 -
.../Datagrid/CrossPlatformExample.cs | 205 -------------------
26 files changed, 388 insertions(+), 292 deletions(-)
----------------------------------------------------------------------