You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2016/03/29 11:29:01 UTC
[7/8] ignite git commit: Merge branch 'master' into ignite-2630
Merge branch 'master' into ignite-2630
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/440354d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/440354d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/440354d7
Branch: refs/heads/ignite-2630
Commit: 440354d72f35045cebebf443d64edcf61b3e038d
Parents: 8a9a048 732abda
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 29 11:27:40 2016 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 29 11:27:40 2016 +0300
----------------------------------------------------------------------
.../rest/RestBinaryProtocolSelfTest.java | 4 +-
.../rest/RestMemcacheProtocolSelfTest.java | 4 +-
.../java/org/apache/ignite/IgniteCache.java | 20 +-
.../discovery/GridDiscoveryManager.java | 2 +-
.../cache/CacheClusterMetricsMXBeanImpl.java | 410 +++++++++++++++++++
.../cache/CacheLocalMetricsMXBeanImpl.java | 410 +++++++++++++++++++
.../cache/CacheMetricsMXBeanImpl.java | 410 -------------------
.../processors/cache/GridCacheAdapter.java | 43 +-
.../GridCachePartitionExchangeManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 15 +-
.../processors/cache/GridCacheProxyImpl.java | 45 +-
.../processors/cache/IgniteCacheProxy.java | 39 +-
.../processors/cache/IgniteInternalCache.java | 31 +-
.../platform/cache/PlatformCache.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 2 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 2 +-
.../CacheMetricsForClusterGroupSelfTest.java | 2 +-
.../cache/CacheSwapUnswapGetTest.java | 4 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 124 +++---
.../GridCacheOffHeapValuesEvictionSelfTest.java | 18 +-
...cheTransactionalAbstractMetricsSelfTest.java | 4 +-
.../dht/GridCacheColocatedDebugTest.java | 2 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 2 +-
...AtomicPartitionedTckMetricsSelfTestImpl.java | 92 ++---
.../near/GridCacheNearMetricsSelfTest.java | 152 +++----
...idCachePartitionedHitsAndMissesSelfTest.java | 2 +-
...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 380 ++++++++---------
...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 92 ++---
...acheContinuousQueryRandomOperationsTest.java | 8 +-
.../multijvm/IgniteCacheProcessProxy.java | 8 +
.../IgniteBinaryCacheQueryTestSuite4.java | 39 ++
.../IgniteCacheQuerySelfTestSuite3.java | 22 -
.../IgniteCacheQuerySelfTestSuite4.java | 49 +++
.../impl/binary/binary_type_updater_impl.cpp | 2 +
modules/platforms/dotnet/Apache.Ignite.sln | 5 +-
.../Compute/ClosureExample.cs | 4 +-
.../Compute/TaskExample.cs | 4 +-
.../Datagrid/ContinuousQueryExample.cs | 11 +-
.../Datagrid/DataStreamerExample.cs | 8 +-
.../Datagrid/PutGetExample.cs | 6 +-
.../Datagrid/QueryExample.cs | 20 +-
.../Datagrid/StoreExample.cs | 16 +-
.../Datagrid/TransactionExample.cs | 14 +-
.../Events/EventsExample.cs | 6 +-
.../Messaging/MessagingExample.cs | 4 +-
.../Misc/LifecycleExample.cs | 2 +-
.../Services/ServicesExample.cs | 6 +-
.../Apache.Ignite.ExamplesDll.csproj | 1 +
.../Apache.Ignite.ExamplesDll/Binary/Account.cs | 1 -
.../Apache.Ignite.ExamplesDll/Binary/Address.cs | 5 +-
.../Binary/Employee.cs | 4 +
.../Binary/EmployeeKey.cs | 4 +-
.../Binary/Organization.cs | 11 +-
.../Binary/OrganizationType.cs | 3 -
.../Datagrid/EmployeeStoreFactory.cs | 38 ++
.../examples/Config/example-cache-query.xml | 118 ------
.../examples/Config/example-cache-store.xml | 59 ---
.../dotnet/examples/Config/example-cache.xml | 87 ----
.../dotnet/examples/Config/example-compute.xml | 70 ----
.../dotnet/examples/Config/examples-config.xml | 98 +++++
61 files changed, 1745 insertions(+), 1305 deletions(-)
----------------------------------------------------------------------