ignite git commit: # Conflicts:

2018-08-02 Thread av
Repository: ignite Updated Branches: refs/heads/ignite-8714 [created] 981bb8c0c # Conflicts: Signed-off-by: Anton Vinogradov # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java Project:

[14/15] ignite git commit: # Conflicts: # modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java # modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/i

2018-01-12 Thread sboikov
# Conflicts: # modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java # modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkJoinedNodeEvtData.java #

[13/15] ignite git commit: # Conflicts: # modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java # modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/i

2018-01-12 Thread sboikov
# Conflicts: # modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java # modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkJoinedNodeEvtData.java #

[1/2] ignite git commit: # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java

2017-01-13 Thread sboikov
Repository: ignite Updated Branches: refs/heads/ignite-gg-11810-1 c7bd20c5d -> 86896a81f # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit:

ignite git commit: # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java

2016-11-02 Thread sboikov
Repository: ignite Updated Branches: refs/heads/ignite-4154 098689c38 -> 0f9843ebb # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: