GitHub user glukos opened a pull request:
https://github.com/apache/ignite/pull/2852
Ignite 6030 merge 6560
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/gridgain/apache-ignite ignite-6030-merge-6560
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/2852.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 #2852
----
commit 27416a7e2a741190c225af7ae1329ab45f4d85df
Author: Konstantin Dudkov <kdud...@ya.ru>
Date: 2017-09-08T13:00:57Z
IGNITE-6030 Persistence per memoryPolicy (first working test)
commit 572671877ca84ba9991213f382e47171bf625012
Author: Konstantin Dudkov <kdud...@ya.ru>
Date: 2017-09-11T15:25:52Z
IGNITE-6030 Remove WAL writes if persistence is disabled for memoryPolicy
commit 20524f8e522d37ad17a7f1016bc16c09d511ffa5
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
Date: 2017-09-12T10:02:54Z
IGNITE-6030 - Persistence per memory policy
commit 38d336c192d75d4d0462864c7e728c4f80e15a3a
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-09-27T13:01:01Z
Merge branch 'master' into ignite-6030-master
# Conflicts:
#
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java
commit 8490e97385764ef83952c412d9f79e3f58b79680
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-09-29T14:17:24Z
Merge branch 'master' into ignite-6030-master
commit be8f6b1746b964e89a473bffafe8723d4645a781
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-02T13:52:37Z
Merge branch 'master' into ignite-6030-master
commit ee0504396dae5dd3c460778ef4c7c813483326a3
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-03T14:52:04Z
IGNITE-6030 Phase 1 - classes renamed
commit 40473bd0bfe9487432e6ed289d950a0a30b53727
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-03T15:05:43Z
IGNITE-6030 Phase 2 - merge of MemoryConfiguration and
PersistenceConfiguration
commit 2d39d9028983c81fb16f8677742a61dfc10b8b57
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-03T15:19:03Z
IGNITE-6030 Phase 3 - renamings of IgniteConfiguration methods
commit 40bf903c743f2e61f935d47b798619b1b034a2a8
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-04T09:27:57Z
IGNITE-6030 Phase 4 - Old classes are added as deprecated,
getDefaultRegionConfiguration is added to DataStorageConfiguration. Public API
is complete.
commit 6b77cbaf07857f5cd55352e515fcca9ad56fefea
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-04T13:27:13Z
IGNITE-6030 Phase 5 - Old MBeans are added as deprecated just in case.
commit c2fe58a89fc5f4e3378403776d4ef662c4acf900
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-04T14:14:17Z
Merge branch 'master' into ignite-6030-master
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
commit c9811e4f5f27ac2ef39fbc554223b58f10d07534
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-05T10:03:18Z
IGNITE-6030 Phase 6 - Internal implementation classes renamed
commit b7bece04793e27857aa69dbf5cf2d4daafd1a141
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-05T10:11:37Z
Merge branch 'master' into ignite-6030-master
commit 4d6af4d2a4c400a6f0598835ad84cde4f9e1837b
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-05T13:08:38Z
IGNITE-6030 Phase 7 - "PersistentStoreConfiguration" use cases of
DataStorageConfiguration fixed
commit 450d444cc4e2bf45cf2e2e8d0c41b2a4c7b61d02
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-05T14:50:25Z
IGNITE-6030 Phase 8 - default DataRegionConfiguration is used project-wide
commit 1f94e9ee5f34b261bdbe4656e5043d81b057cd1e
Author: Pavel Tupitsyn <ptupit...@apache.org>
Date: 2017-10-06T09:40:49Z
Merge branch 'master' into ignite-6030-master
commit f15de9e99de5d6529bba04fbd6cbf72f8aa5273a
Author: Pavel Tupitsyn <ptupit...@apache.org>
Date: 2017-10-06T09:54:21Z
Merge branch 'master' into ignite-6030-master
commit fb3399b7ea1a0fc9a42781f95cb56b85a5f56706
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-06T11:05:14Z
IGNITE-6030 default persistence enabled should be false
commit def9b9f467d15b8602afea31fb23ab04f2920719
Author: vsisko <vsi...@gridgian.com>
Date: 2017-10-06T11:06:47Z
IGNITE-6560 WIP
commit 740be150b9ebc6606fe527683a31d59d21626dcb
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-06T15:57:36Z
IGNITE-6030 wip
commit c940b722fec5e15a1e8561ec1c940f38c279eae7
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-06T16:00:05Z
IGNITE-6030 systemCache -> systemRegion
commit 689c204ae669579e18c4dd818e06203d9ef68b93
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-06T17:09:28Z
IGNITE-6030 wip
commit 8168232aeb5c6e6ac81dc8a13279c5a5263aece1
Author: Pavel Tupitsyn <ptupit...@apache.org>
Date: 2017-10-09T07:10:58Z
Merge branch 'master' into ignite-6030-master
commit 905bb10103f4b975d64e41716c55afcb235e924e
Author: Pavel Tupitsyn <ptupit...@apache.org>
Date: 2017-10-09T07:13:25Z
Revert platform changes
commit 82c226a2bf9dc5ea496e739f124d9a0b1367c630
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-09T10:29:01Z
IGNITE-6030 Renamings: setDataRegionConfigurations and
setDefaultDataRegionConfiguration
commit ce0190ec7a3b7390a693b404414552e5d172657e
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-09T10:52:59Z
IGNITE-6030 sysMemPlc -> sysDataReg
commit 5351816a9e32cbcdc83ff1bf11ec21d0e4a63eed
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-09T11:58:41Z
IGNITE-6030 metrics classes conversion + refactoring in configuration
validation
commit eeb0f035d2b8787e52b3920ab7ccae07771c8ca7
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-09T15:08:38Z
IGNITE-6030 fixing tests
commit a7ece7db78825527bf30b9df4eb45b8a4d3c562f
Author: Ivan Rakov <ivan.glu...@gmail.com>
Date: 2017-10-09T15:31:36Z
Merge branch 'master' into ignite-6030-master
----
---
