You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/17 03:36:08 UTC
[5/5] 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/685d52c2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/685d52c2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/685d52c2
Branch: refs/heads/ignite-843-rc2
Commit: 685d52c20720ea52ec5364cd68fccda70c87a59c
Parents: 4d9f443 d8c8214
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Dec 17 09:35:39 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Dec 17 09:35:39 2015 +0700
----------------------------------------------------------------------
.../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 | 25 +++-
.../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 | 3 +-
.../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 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 16 +-
.../Apache.Ignite.Core.csproj | 20 ++-
.../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 -
.../dotnet/Apache.Ignite.Core/Index.cs | 31 ----
.../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 ++++
parent/pom.xml | 1 +
40 files changed, 613 insertions(+), 681 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/685d52c2/parent/pom.xml
----------------------------------------------------------------------