Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IGNITE-5458-2.1.1 #2125

Closed
wants to merge 384 commits into from
Closed

IGNITE-5458-2.1.1 #2125

wants to merge 384 commits into from

Conversation

devozerov
Copy link
Member

No description provided.

akuznetsov-gridgain and others added 30 commits April 18, 2017 23:52
(cherry picked from commit 8ad5a94)
Jokser and others added 26 commits June 13, 2017 16:56
# 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
# 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
devozerov pushed a commit to gridgain/apache-ignite that referenced this pull request Jun 14, 2017
…ixed affinity calculation in some cases. This closes apache#2113. This closes apache#2125.
@devozerov devozerov closed this Jun 14, 2017
@devozerov devozerov deleted the ignite-5458-2.1.1 branch June 14, 2017 15:29
vladErmakov07 pushed a commit to gridgain/apache-ignite that referenced this pull request Oct 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet