GitHub user gvvinblade opened a pull request:
https://github.com/apache/ignite/pull/2185
IGNITE-5581
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/gridgain/apache-ignite ignite-gg-12168
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/2185.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2185
----
commit 2b0741039e7cc6e36871b97bab53780edfc84648
Author: Ilya Lantukh <ilant...@gridgain.com>
Date: 2017-06-13T12:38:55Z
ignite-5267 : Removed redundant test.
commit 4a86cae203ed9aed953cd6093884cf8cab4531e3
Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
Date: 2017-06-13T12:48:39Z
ignite-2.1.1 fix state processor, skip if daemon
commit 5c567aeb5458159bc41dbd251dfa8a65701f4861
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-06-13T13:06:42Z
ignite-2.1.1 moving pds tests that depend on indexing to separate suite
commit 5e9d9ebc1140f9647fc1b325ba81d0ad6c2c69f3
Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
Date: 2017-06-13T13:21:20Z
ignite-2.1.1 Added description to MX bean
commit 2c2a9e652b13cf60b7e878a4e20f4ab4ae014e9c
Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
Date: 2017-06-13T13:21:39Z
Merge remote-tracking branch 'professional/ignite-2.1.1' into ignite-2.1.1
commit 9141b3698d0ec98e512efbc78864cc06781fd8c7
Author: devozerov <voze...@gridgain.com>
Date: 2017-06-13T13:32:28Z
IGNITE-5267: Fixed too early StoredCacheData initialization.
commit 0a00f03da78649320cb0bb3579f44d6fe037facc
Author: devozerov <voze...@gridgain.com>
Date: 2017-06-13T13:32:58Z
Merge remote-tracking branch 'upstream/ignite-2.1.1' into ignite-2.1.1
commit 2d8c6519d36e2d7890a45b258d3b7439942dca66
Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
Date: 2017-06-13T13:39:13Z
ignite-2.1.1 Add joining node tests
commit c5cee32a510e5a3524ff88119acfd1963c74d8ad
Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
Date: 2017-06-13T13:39:30Z
Merge remote-tracking branch 'professional/ignite-2.1.1' into ignite-2.1.1
commit d369dfc4973c179861d1d2ff37fbe8c6c0543d1a
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-06-13T13:47:22Z
ignite-2.1.1 IgniteSpringDataTestSuite - added vm ip finder
commit ab62ce847cb73854f31f1232144f487786a6a3d1
Author: Pavel Kovalenko <jokse...@gmail.com>
Date: 2017-06-08T21:30:41Z
IGNITE-5267 Remove entry from on-heap locks map if it was removed from
off-heap
commit 33a9cc4cf9b32d93e34c5855d52ce208a3fd8228
Author: Pavel Kovalenko <jokse...@gmail.com>
Date: 2017-06-08T21:33:30Z
IGNITE-5267 Deserialize binary object explicitly instead of calling cache.
Small refactoring.
commit 95257a16aef0bc0bbacdee03503ee483ffc75bda
Author: Pavel Kovalenko <jokse...@gmail.com>
Date: 2017-06-08T21:34:37Z
IGNITE-5267 Small test refactoring and speeding up
commit e2354cb5ea8965276c3696895c86e51315765571
Author: Pavel Kovalenko <jokse...@gmail.com>
Date: 2017-06-08T21:37:38Z
IGNITE-5267 Fixed and simplified test
commit 41cea0bc2f887881a78436e54143313af27e7fa8
Author: Pavel Kovalenko <jokse...@gmail.com>
Date: 2017-06-08T21:38:55Z
IGNITE-5267 Make partitionMapExchange timeout configurable
commit 8e1439782b993c8ccb974bcdbd55d4f2b28a5489
Author: Pavel Kovalenko <jokse...@gmail.com>
Date: 2017-06-08T21:40:53Z
IGNITE-5267 Use owners instead of nodes to properly check finishing of
partitionMapExchange
commit ef732dae02673c2ce79575b57454a573f0d1d591
Author: Pavel Kovalenko <jokse...@gmail.com>
Date: 2017-06-08T21:42:00Z
IGNITE-5267 Provide entry key explicitly in cache queries. Fixed test.
commit 5eb40528bd6e52b4c13a4c21ecca74407b081898
Author: Pavel Kovalenko <jokse...@gmail.com>
Date: 2017-06-08T21:42:34Z
IGNITE-5267 Explicitly fail test with known issue
commit e4f203b512cba1dc8ae82b506cadebfed3fd7f65
Author: sboikov <sboi...@gridgain.com>
Date: 2017-06-13T13:58:12Z
review
commit fd7050c72c8125ed1dd213ef781bdb9971d00413
Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
Date: 2017-06-13T14:02:54Z
ignite-2.1.1 Add joining node tests in suit
commit 3e509aa604ca342b3f42a73e771a5a4f678d7132
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-06-13T14:13:43Z
ignite-2.1.1 Fixing compilation in tests
commit dea416fa65874d4e33b37b46368f9e476a3904f4
Author: dpavlov <dpav...@gridgain.com>
Date: 2017-06-13T15:00:32Z
Merge fix: 4.ea2 into 5267: remove node is loopback check
commit b52a84e885b0f88971290200942e0bbe01252ff6
Author: sboikov <sboi...@gridgain.com>
Date: 2017-06-13T15:09:41Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-2.1.1
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticAware.java
#
modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
#
modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
#
modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
#
modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
#
modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
commit fb2e6d4ab00e3e443bdd896918e812d6fa6119ba
Author: sboikov <sboi...@gridgain.com>
Date: 2017-06-13T15:10:18Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-2.1.1
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticAware.java
#
modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
#
modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
#
modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
#
modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
#
modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
commit 2300ec47da979847c36a41e95bebbbd3af1758f1
Author: sboikov <sboi...@gridgain.com>
Date: 2017-06-13T15:10:52Z
Merge remote-tracking branch 'community/ignite-2.1.1' into ignite-2.1.1
commit ff9e4559711c69c73210f5d91036fc829b7eef17
Author: Ilya Lantukh <ilant...@gridgain.com>
Date: 2017-06-13T15:24:09Z
ignite-5267 : Minors.
commit 34f8c244313ebf94b65c40d5f17dc507f2b54251
Author: Ilya Lantukh <ilant...@gridgain.com>
Date: 2017-06-13T15:32:33Z
ignite-5267 : Minors.
commit 2101132fb553c83a2936bbd8501dbdb696ddd054
Author: mcherkasov <mcherka...@gridgain.com>
Date: 2017-06-13T15:36:54Z
IGNITE-5364 Remove contention on DataStructure creation or removing
commit c49daaecc8db6c0d71927cc149274e9b51e37911
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-06-13T15:44:54Z
ignite-2.1.1 Activate nodes after start
commit 6aecaa358c1f9365eb8b1d073634ac74cc65f4d6
Author: Ilya Lantukh <ilant...@gridgain.com>
Date: 2017-06-13T16:08:24Z
ignite-5267 : Minors.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
