Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19d92a09
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19d92a09
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19d92a09
Branch: refs/heads/ignite-1537
Commit: 19d92a09fff5d38e0ba84de736c23f604d961e9d
Parents: cd02f2c 916f59a
Author: sboikov <[email protected]>
Authored: Thu Dec 17 12:15:33 2015 +0300
Committer: sboikov <[email protected]>
Committed: Thu Dec 17 12:15:33 2015 +0300
----------------------------------------------------------------------
.../store/dummy/CacheDummyPersonStore.java | 113 ----------
.../store/dummy/CacheDummyStoreExample.java | 133 ------------
.../datagrid/store/dummy/package-info.java | 22 --
.../store/jdbc/CacheJdbcPersonStore.java | 43 +---
.../store/jdbc/CacheJdbcStoreExample.java | 24 ++-
.../store/spring/CacheSpringPersonStore.java | 131 ------------
.../store/spring/CacheSpringStoreExample.java | 147 -------------
.../datagrid/store/spring/package-info.java | 22 --
.../ignite/examples/CacheExamplesSelfTest.java | 10 +-
modules/core/pom.xml | 5 +
.../apache/ignite/internal/IgniteKernal.java | 38 ++--
.../processors/cache/GridCacheUtils.java | 18 +-
.../internal/visor/query/VisorQueryJob.java | 4 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +++-
.../core/src/main/resources/ignite.properties | 1 +
.../CacheSerializableTransactionsTest.java | 8 +
.../IgniteStartCacheInTransactionSelfTest.java | 6 +-
.../GridServiceProcessorProxySelfTest.java | 3 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 16 +-
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++++-
.../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 | 19 ++
.../Apache.Ignite.Core/Binary/Package-Info.cs | 26 +++
.../Cache/Event/Package-Info.cs | 26 +++
.../Cache/Expiry/Package-Info.cs | 26 +++
.../Apache.Ignite.Core/Cache/Package-Info.cs | 26 +++
.../Cache/Query/Continuous/Package-Info.cs | 26 +++
.../Cache/Query/Package-Info.cs | 26 +++
.../Cache/Store/Package-Info.cs | 26 +++
.../Apache.Ignite.Core/Cluster/Package-Info.cs | 26 +++
.../Apache.Ignite.Core/Common/Package-Info.cs | 26 +++
.../Apache.Ignite.Core/Compute/IComputeTask.cs | 11 +-
.../Apache.Ignite.Core/Compute/Package-Info.cs | 26 +++
.../DataStructures/Package-Info.cs | 26 +++
.../Datastream/Package-Info.cs | 26 +++
.../Apache.Ignite.Core/Events/Package-Info.cs | 26 +++
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 -
.../Lifecycle/Package-Info.cs | 26 +++
.../Messaging/Package-Info.cs | 26 +++
.../dotnet/Apache.Ignite.Core/Package-Info.cs | 36 ++++
.../Apache.Ignite.Core/Resource/Package-Info.cs | 26 +++
.../Apache.Ignite.Core/Services/Package-Info.cs | 26 +++
.../Transactions/Package-Info.cs | 26 +++
modules/platforms/dotnet/Apache.Ignite.sln | 1 +
.../Apache.Ignite.Examples.csproj | 1 -
.../Datagrid/CrossPlatformExample.cs | 205 -------------------
parent/pom.xml | 1 +
63 files changed, 841 insertions(+), 974 deletions(-)
----------------------------------------------------------------------
