ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [13/13] ignite git commit: Merge branch 'master' into ignite-2004
Date Mon, 11 Apr 2016 14:38:45 GMT
Merge branch 'master' into ignite-2004


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7adb618b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7adb618b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7adb618b

Branch: refs/heads/ignite-2004
Commit: 7adb618b1429486d2fa3fd0327a0e06a964be3fe
Parents: b118b68 b912754
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Mon Apr 11 17:38:07 2016 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Mon Apr 11 17:38:07 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/MarshallerContextImpl.java  |   7 +-
 .../processors/cache/GridCacheAdapter.java      |   2 +-
 .../processors/cache/GridCacheProxyImpl.java    |   4 +-
 .../processors/cache/IgniteInternalCache.java   |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   4 +-
 .../distributed/near/GridNearAtomicCache.java   |   4 +-
 .../utils/PlatformConfigurationUtils.java       |  78 +++++
 .../MarshallerCacheJobRunNodeRestartTest.java   | 307 +++++++++++++++++++
 .../testsuites/IgniteCacheTestSuite4.java       |   3 +
 .../hadoop/jobtracker/HadoopJobTracker.java     |   8 +-
 .../testsuites/IgniteHadoopTestSuite.java       |   4 +-
 .../Apache.Ignite.Core.Tests.NuGet.csproj       |  18 ++
 .../Apache.Ignite.Core.Tests.NuGet.sln          |   6 +
 .../Apache.Ignite.Core.Tests.csproj             |  59 ++--
 .../Binary/BinaryBuilderSelfTest.cs             |   8 +-
 .../Cache/Query/CacheLinqTest.cs                |  14 +-
 .../Config/Apache.Ignite.exe.config.test2       |   2 +-
 .../Config/Cache/Store/cache-store-session.xml  |   3 +-
 .../Config/Compute/compute-grid1.xml            |   3 +-
 .../Config/Compute/compute-grid2.xml            |   3 +-
 .../Config/Compute/compute-grid3.xml            |   5 +-
 .../Config/Compute/compute-standalone.xml       |   4 +-
 .../Config/Dynamic/dynamic-client.xml           |   3 +-
 .../Config/Dynamic/dynamic-data-no-cfg.xml      |   3 +-
 .../Config/Dynamic/dynamic-data.xml             |   3 +-
 .../Config/Lifecycle/lifecycle-beans.xml        |   3 +-
 .../Config/Lifecycle/lifecycle-no-beans.xml     |   3 +-
 .../Config/cache-binarizables.xml               |   3 +-
 .../Config/cache-local-node.xml                 |   3 +-
 .../Config/cache-query-continuous.xml           |   3 +-
 .../Config/cache-query.xml                      |   3 +-
 .../Config/ignite-dotnet-cfg.xml                |   2 +-
 .../Config/marshaller-default.xml               |   3 +-
 .../Config/marshaller-explicit.xml              |   3 +-
 .../Config/marshaller-invalid.xml               |   3 +-
 .../native-client-test-cache-affinity.xml       |   3 +-
 .../native-client-test-cache-parallel-store.xml |   3 +-
 .../Config/native-client-test-cache-store.xml   |   3 +-
 .../Config/native-client-test-cache.xml         |   3 +-
 .../Config/reconnect-test.xml                   |  43 +++
 .../Config/start-test-grid1.xml                 |   3 +-
 .../Config/start-test-grid2.xml                 |   3 +-
 .../Config/start-test-grid3.xml                 |   3 +-
 .../IgniteConfigurationSerializerTest.cs        |  48 ++-
 .../IgniteConfigurationTest.cs                  |  36 ++-
 .../Apache.Ignite.Core.Tests/ReconnectTest.cs   |   5 +-
 .../Apache.Ignite.Core.Tests/TestUtils.cs       |   5 +-
 .../dotnet/Apache.Ignite.Core.Tests/app.config  |   4 +-
 .../Apache.Ignite.Core.csproj                   |   9 +-
 .../Configuration/AtomicConfiguration.cs        |  58 ++++
 .../Apache.Ignite.Core/IgniteConfiguration.cs   | 114 ++++++-
 .../IgniteConfigurationSection.xsd              |  24 ++
 .../Impl/Cluster/ClusterNodeImpl.cs             |   2 +-
 .../Common/IgniteConfigurationXmlSerializer.cs  |  67 +++-
 .../Impl/Common/ObjectStringConverter.cs        | 104 +++++++
 .../Apache.Ignite.Core/Impl/IgniteManager.cs    |   6 +-
 .../Transactions/ITransaction.cs                |   3 +-
 .../Transactions/TransactionConfiguration.cs    |  76 +++++
 .../Apache.Ignite.Linq.csproj                   |   2 +-
 .../dotnet/Apache.Ignite.Linq/CompiledQuery.cs  |   6 +-
 .../Impl/CacheFieldsQueryExecutor.cs            |   6 +-
 .../NuGet/LINQPad/QueryExample.linq             |   6 +-
 .../Compute/ClosureExample.cs                   |   8 +-
 .../Compute/TaskExample.cs                      |  11 +-
 .../Datagrid/ContinuousQueryExample.cs          |   8 +-
 .../Datagrid/DataStreamerExample.cs             |  12 +-
 .../Datagrid/LinqExample.cs                     |   8 +-
 .../Datagrid/PutGetExample.cs                   |  11 +-
 .../Datagrid/QueryExample.cs                    |  13 +-
 .../Datagrid/StoreExample.cs                    |  13 +-
 .../Datagrid/TransactionExample.cs              |  14 +-
 .../Events/EventsExample.cs                     |  12 +-
 .../Messaging/MessagingExample.cs               |   9 +-
 .../Misc/LifecycleExample.cs                    |   1 -
 .../Services/ServicesExample.cs                 |   9 +-
 .../dotnet/examples/Config/examples-config.xml  |   2 +-
 .../commands/cache/VisorCacheCommand.scala      |  12 +-
 77 files changed, 1141 insertions(+), 235 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7adb618b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/7adb618b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------


Mime
View raw message