GitHub user alexpaschenko opened a pull request:
https://github.com/apache/ignite/pull/3293
IGNITE-7280
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/gridgain/apache-ignite ignite-7280
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/3293.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 #3293
----
commit f6e982540e65ab17d439dba990794f35616a30dd
Author: sboikov <sboikov@...>
Date: 2017-08-30T09:45:40Z
ignite-3478
commit 275a85db5cd6923b36126166ae99b15e876192be
Author: sboikov <sboikov@...>
Date: 2017-08-31T07:44:07Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
commit b7b9089f0102b8cab9942a9c887d93e9f26cc7d2
Author: sboikov <sboikov@...>
Date: 2017-08-31T09:00:36Z
disco cache cleanup
commit 855c2d45794c300d41e386b4e6fa40736cc3e40d
Author: sboikov <sboikov@...>
Date: 2017-08-31T09:09:58Z
Merge branch 'ignite-3478-1' into ignite-3478
commit 08be7310a93d3ce455215b97cf8ab1a2c3f0ab31
Author: sboikov <sboikov@...>
Date: 2017-08-31T09:52:23Z
ignite-3478
commit fce2e31f0fd2f4f6a9944422e40408a0c65cfe90
Author: sboikov <sboikov@...>
Date: 2017-09-04T08:13:50Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
commit d3c049952384750c5543a9f88b383c033ef74096
Author: sboikov <sboikov@...>
Date: 2017-09-04T08:52:11Z
ignite-3478
commit e71ce1937a18dd32448e92b1038dc48d4cb6f8ab
Author: sboikov <sboikov@...>
Date: 2017-09-04T10:16:03Z
ignite-3478
commit 5fac5b0965e97f8951e16e10ca9229a2e78ddb0c
Author: sboikov <sboikov@...>
Date: 2017-09-05T10:16:44Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
commit 2e0c9c08e046e8d6af1b5358d9053eae999b1fb4
Author: sboikov <sboikov@...>
Date: 2017-09-05T11:30:55Z
ignite-3478
commit e1e07ffdf2d711ba3e72f316f5a3970eff27372e
Author: sboikov <sboikov@...>
Date: 2017-09-05T11:31:14Z
ignite-3478
commit cbada3934a386668da0b11d4de7d0f58a4d04dfe
Author: sboikov <sboikov@...>
Date: 2017-09-05T11:49:49Z
ignite-3484
commit 5a82c68dcd1927bb6fded8b7def38c91ff6e145b
Author: sboikov <sboikov@...>
Date: 2017-09-05T11:59:49Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
commit bc9134c94b7a738dc1664e96ca6eabb059f1c268
Author: sboikov <sboikov@...>
Date: 2017-09-05T12:03:39Z
Merge branch 'ignite-3478' into ignite-3484
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
commit b4bfcde78825c6517232e49d389bdb5de19f05a9
Author: sboikov <sboikov@...>
Date: 2017-09-05T12:27:51Z
ignite-3484
commit 43834aaab9e2c3cd5fdd55289fdc4a9ff8ab6599
Author: sboikov <sboikov@...>
Date: 2017-09-05T13:13:00Z
ignite-3478
commit d1b828095713fcadfa260cf94fef01b42a1b12fd
Author: sboikov <sboikov@...>
Date: 2017-09-05T13:13:33Z
Merge branch 'ignite-3478' into ignite-3484
commit 6be6779b6336c36cd71eef0a25199a6a877ce6b5
Author: sboikov <sboikov@...>
Date: 2017-09-05T13:47:11Z
ignite-3484
commit e3bba83256c1eb53c4b40fbd9ddba47fcf9d58d5
Author: sboikov <sboikov@...>
Date: 2017-09-06T07:10:26Z
ignite-3484
commit dd0afb28466094b801506da8afa3601bfaebd853
Author: sboikov <sboikov@...>
Date: 2017-09-06T07:30:04Z
ignite-3484
commit 27b87b413348b03986a463551db24b7726321732
Author: sboikov <sboikov@...>
Date: 2017-09-06T08:19:18Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
commit dcaf8801accd6ee089849a82b2ccd558aec81895
Author: sboikov <sboikov@...>
Date: 2017-09-06T08:19:30Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
commit c966451d0bf7059575de92bcfae43d72096ebce4
Author: sboikov <sboikov@...>
Date: 2017-09-06T08:27:04Z
Merge branch 'ignite-3478' into ignite-3484
commit 91b9911731a387a3199ddbbc22704bc14af09995
Author: sboikov <sboikov@...>
Date: 2017-09-06T09:22:22Z
ignite-3484
commit e40b4d9dcd6fe6c1cd2640bdd7116ca5a08ed781
Author: sboikov <sboikov@...>
Date: 2017-09-07T09:12:32Z
ignite-3484
commit 41a1c571e6ba1765941e2f1679dc4ac1582275c4
Author: sboikov <sboikov@...>
Date: 2017-09-08T07:55:24Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3484
commit 1626130801dc330bcaf693f46906f6564cce6802
Author: sboikov <sboikov@...>
Date: 2017-09-08T08:04:57Z
ignite-3484
commit 91bbb7cd24f38a38e2e65fc3ebf5637572b11b25
Author: sboikov <sboikov@...>
Date: 2017-09-08T12:34:52Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-6149
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
commit 085a3219088bc1610d1928c437f075a6fb9a4f9b
Author: sboikov <sboikov@...>
Date: 2017-09-08T13:02:16Z
ignite-6149
commit c6f894817ef063984cee1ea886313eecc8da3be0
Author: sboikov <sboikov@...>
Date: 2017-09-11T13:51:11Z
ignite-6149
----
---
