Merge branch 'ignite-2.0' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5072-merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/588ddcb8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/588ddcb8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/588ddcb8 Branch: refs/heads/ignite-5072-merge Commit: 588ddcb8f2fd0ddc6647c12cb55239e9254d9653 Parents: fe50d76 7bfff3b Author: Alexey Goncharuk <[email protected]> Authored: Thu Apr 27 15:57:30 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Apr 27 15:57:30 2017 +0300 ---------------------------------------------------------------------- .../client/memcache/MemcacheRestExample.java | 2 +- .../MemcacheRestExampleNodeStartup.java | 1 + .../client/ClientDefaultCacheSelfTest.java | 4 +- .../JettyRestProcessorAbstractSelfTest.java | 143 +++++++------ .../processors/cache/GridCacheProcessor.java | 6 +- .../evict/PageAbstractEvictionTracker.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 8 +- modules/core/src/test/config/igfs-loopback.xml | 18 -- modules/core/src/test/config/igfs-shmem.xml | 18 -- .../IgniteClientReconnectCacheTest.java | 12 +- .../paged/PageEvictionAbstractTest.java | 13 +- ...LruNearEnabledPageEvictionMultinodeTest.java | 28 +++ ...LruNearEnabledPageEvictionMultinodeTest.java | 28 +++ ...DeadlockDetectionMessageMarshallingTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 6 +- .../IgniteCacheEvictionSelfTestSuite.java | 4 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +- .../http/jetty/GridJettyObjectMapper.java | 13 +- modules/rocketmq/licenses/apache-2.0.txt | 202 +++++++++++++++++++ 19 files changed, 366 insertions(+), 147 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/588ddcb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/evict/PageAbstractEvictionTracker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/588ddcb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionAbstractTest.java ----------------------------------------------------------------------
