GitHub user anton-vinogradov opened a pull request:
https://github.com/apache/ignite/pull/3335
Ignite 7003 1
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/gridgain/apache-ignite ignite-7003-1
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/3335.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 #3335
----
commit ec58473bfce5ec28b8710b98e733a23ef38bbfaa
Author: Anton Vinogradov <av@...>
Date: 2017-12-04T19:45:31Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit e83410430e3a03c47e30a41ae57fb11bfc817e72
Author: Anton Vinogradov <av@...>
Date: 2017-12-05T14:31:16Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 8cdf8ed5492dd8dd517f97d3911b52425b97539e
Author: Anton Vinogradov <av@...>
Date: 2017-12-05T16:33:13Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit f0d4ffe5be5e6ba6b7707757cb92004e4bbe8a37
Author: Anton Vinogradov <av@...>
Date: 2017-12-06T11:56:13Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 80bde0ec75450ed95a0e6c5046daaec239699ac7
Author: Anton Vinogradov <av@...>
Date: 2017-12-08T19:07:00Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 3baa64a014f2b40ec2fd52c0ad779cf801924d77
Author: Anton Vinogradov <av@...>
Date: 2017-12-11T12:39:42Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-7003
commit 4c39c3b8964eb979d8991167593c5ccb0f7e9c36
Author: Anton Vinogradov <av@...>
Date: 2017-12-11T13:33:26Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 3b6ea4085cfcf8cc1931f4f5edef3d8ea66ba369
Author: devozerov <vozerov@...>
Date: 2017-12-13T13:19:34Z
Merge branch 'master' into ignite-7003
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
commit d3b99a76eb8ad215ea70ac7efe958bee1739af75
Author: Anton Vinogradov <av@...>
Date: 2017-12-16T17:43:57Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit afd34b023d4d480c3fb4ae50addf504c44f1c823
Author: Anton Vinogradov <av@...>
Date: 2017-12-17T16:23:37Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit d17600ddc50891562d82e10d2e3aecb5a9ba3a86
Author: Anton Vinogradov <av@...>
Date: 2017-12-17T16:48:07Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 26f352d29a463e7ff66dd20df757ded19b04e037
Author: Anton Vinogradov <av@...>
Date: 2017-12-17T18:15:49Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 0362d9deb884be223dad1ffe4a5459ed5ef7b3ca
Author: Anton Vinogradov <av@...>
Date: 2017-12-17T19:05:06Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 0f97bd4aee47376812d2bdfcea0b25390b807729
Author: Anton Vinogradov <av@...>
Date: 2017-12-17T20:51:10Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 68678aab1981ef6173846e720e8b22fced99b888
Author: Anton Vinogradov <av@...>
Date: 2017-12-17T21:05:47Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-7003
Signed-off-by: Anton Vinogradov <[email protected]>
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.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/persistence/pagemem/PageMemoryImpl.java
commit a8f356ab0b08ed4b17653a5bde6df9e165d980d3
Author: Anton Vinogradov <av@...>
Date: 2017-12-18T17:29:46Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit e43dfdbdc2cca2422c77229154495a49fd7f38fd
Author: Anton Vinogradov <av@...>
Date: 2017-12-18T22:17:41Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit eb7dbcccc2856c4d8fac066177c48b2bf41c74cf
Author: Anton Vinogradov <av@...>
Date: 2017-12-19T12:53:45Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit ca421254d0a7e35a05a643099459a445722d1dda
Author: Anton Vinogradov <av@...>
Date: 2017-12-19T16:21:51Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 0fa2d9fa091f22a69959c574fab54d25ee43b7cd
Author: Anton Vinogradov <av@...>
Date: 2017-12-19T16:40:32Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 0af10c32fe88c86421d603190d2635489c7e8c21
Author: Anton Vinogradov <av@...>
Date: 2017-12-19T16:40:49Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 413324ecf5a4d578a32995bf3358d7f57beb3d86
Author: Anton Vinogradov <av@...>
Date: 2017-12-19T16:53:13Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 7b76f2f239df0043a806bceb628d8d0e207d263c
Author: Anton Vinogradov <av@...>
Date: 2017-12-19T20:22:39Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit c544febbe20df76e5dc4e1c7c3ba64f86e945096
Author: Anton Vinogradov <av@...>
Date: 2017-12-19T23:58:18Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit 43444384da4ef70885a893a8e8b4cbfb2a65d0b1
Author: Anton Vinogradov <av@...>
Date: 2017-12-20T07:13:04Z
IGNITE-6411 WIP
Signed-off-by: Anton Vinogradov <[email protected]>
commit a55e2a4c6f1f96d0a12491ba9c9068cb7eda3086
Author: devozerov <vozerov@...>
Date: 2017-12-22T09:40:06Z
Merge remote-tracking branch 'upstream/ignite-7003' into ignite-7003
commit 3979c46ceb398c02643b2426a68b13ae5d0c2561
Author: devozerov <vozerov@...>
Date: 2017-12-22T09:41:01Z
Merge branch 'master' into ignite-7003
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
commit 71bcd292c67e87ebdfbbae8b02cd43bb8e40aa03
Author: devozerov <vozerov@...>
Date: 2017-12-22T09:43:14Z
Cleanup.
commit 1edd3a926d114b87a6a90a930dc662e5a8a706e6
Author: devozerov <vozerov@...>
Date: 2017-12-22T10:02:19Z
Minors.
commit 0acefb9f6610595d337bf8382a0f51235b95f645
Author: devozerov <vozerov@...>
Date: 2017-12-29T08:15:03Z
Merge branch 'master' into ignite-7003
----
---
