GitHub user alamar opened a pull request: https://github.com/apache/ignite/pull/3564
Ignite gg 13518 You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-gg-13518 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/3564.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 #3564 ---- commit f3f726e9059e492573dc5125fd5edb5d2f71e9d3 Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-13T11:11:17Z IGNITE-4196: Added means to specify port for H2 debug console. This closes #1486. (cherry picked from commit b246260) commit c2c237d1222557d3e6b35d9a51a61a4c78e56782 Author: Sergey Kalashnikov <skalashnikov@...> Date: 2017-02-03T08:41:14Z IGNITE-4196: Added means to specify port for H2 debug console. This closes #1486. (cherry picked from commit b246260) commit 4a8f295f2f2f34e8472b1d1320f03744135b2504 Author: Igor Sapego <isapego@...> Date: 2017-06-13T16:47:00Z IGNITE-5478: ODBC: SQLNumParams now returns number of required parameters. (cherry picked from commit b1c56a1) commit a2a4ec1ee9794cb542f146a07c6c67002cad444e Author: Igor Sapego <isapego@...> Date: 2017-06-14T09:16:43Z IGNITE-5478: Fix for cherry pick commit d268b32cb252a5f06887d2b803d27ddc20ded95f Author: Igor Sapego <isapego@...> Date: 2017-06-16T09:27:35Z IGNITE-4370: Implemented writing of batch of parameters for ODBC. (cherry picked from commit c10be5780589cc84e7929e234e4411d515166e0b) commit 7fbaecc67f1b204162bda4595d6c118ddd45f963 Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-16T17:01:49Z IGNITE-5527: Prevent starvation in stripe pool on unstable topology. commit f81964f59b0ea5b8dfdc8eb2acc34d2a5b8fee07 Author: sboikov <sboikov@...> Date: 2017-01-10T13:59:17Z Do not evict removed entries, otherwise removes can be lost. (cherry picked from commit 55ac6e7) commit 5dd74ff635de50ff9561ccdb51bdeb620f60c3db Author: sboikov <sboikov@...> Date: 2017-01-10T13:59:17Z Do not evict removed entries, otherwise removes can be lost. (cherry picked from commit 55ac6e7) commit 5fb5c7e3b54ae4efb7a6a1832ba647677d93e0cd Author: Evgenii Zhuravlev <ezhuravlev@...> Date: 2017-06-22T06:43:03Z IGNITE-5399 Manual cache rebalancing feature is broken commit 01d41b72ecc3e81dfc8966cc0e395c247037241c Author: Evgenii Zhuravlev <ezhuravlev@...> Date: 2017-06-21T10:48:15Z GG-12256 H2Indexes are not deleted if key class implements Externalizable commit 5ac9afc719138e37a7d97d9d9db05243eee9a942 Author: Evgenii Zhuravlev <ezhuravlev@...> Date: 2017-06-22T09:36:14Z IGNITE-5399 add test to testsuite commit a935d40a80e2f928a84a145aba540a45b156687f Author: Evgenii Zhuravlev <ezhuravlev@...> Date: 2017-06-22T12:10:32Z GG-12256 Minor fixes commit 7e2468770a4eb47a4f61204d8c2000b6ab67c967 Author: nikolay_tikhonov <ntikhonov@...> Date: 2017-06-22T13:13:01Z IGNITE-GG-12197 Fixed "Ignore events for discarded update in CLOCK mode". Signed-off-by: nikolay_tikhonov <ntikho...@gridgain.com> commit 5858efd406bb54352de14a0a7e7f21c2ac7bf899 Author: sboikov <sboikov@...> Date: 2016-12-16T16:23:29Z IGNITE-2412 - Do not acquire asyncSemaphore for synchronous operations (cherry-picked from master) (cherry picked from commit 82b4073) commit 113a1380da34ea804d68757d39926da97dee09b6 Author: Alexey Goncharuk <alexey.goncharuk@...> Date: 2017-06-13T05:20:22Z GG-12355: Backported IO latency test. commit 540ca449f1bd2386d3ba0722afb21dd3a504d044 Author: Alexey Goncharuk <alexey.goncharuk@...> Date: 2017-06-13T17:55:38Z GG-12355: Added discovery ring latency test + made it available from MBean (cherry-picked from master). commit 0fc6271d8e39125bf5ee341e50a2665a04fc8b1e Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-21T10:42:12Z GG-12350: GridDhtAtomicSingleUpdateRequest misses topologyVersion() method override. commit f8224d13cf9a6432ba65e0016370ba51bbb544e9 Author: Alexey Goncharuk <alexey.goncharuk@...> Date: 2017-06-15T19:49:45Z GG-12299: Make sure concurrent type registrations do not trigger multiple cache updates. commit 4ffc3acfa1bc43bea8c79bfd1864787c15cfc4de Author: Alexey Goncharuk <alexey.goncharuk@...> Date: 2017-06-20T04:59:09Z IGNITE-5528 - IS_EVICT_DISABLED flag is not cleared on cache store exception. commit 8cd9e829380f4c91cc9bb126169863286d1cb323 Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-21T12:40:14Z GG-12353: Added local binary context flag. Backport of IGNITE-5223 with fixes. commit 9036ad239d68eff663bc73a81baab2826b054d9a Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-21T15:25:31Z Added MBean for system cache executors. commit ed34a5dc681ea8f284f4d25c5575ad46569cc600 Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-21T15:33:55Z Partial fix of IGNITE-5562. commit d427021f329292fb69d348ba949ad1f8f1e9089e Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-21T16:30:27Z IGNITE-5552: ServiceProcessor recalculates all service assignments even if there is a pending topology change. commit f1b9cdc0716a1b23f54d68ce0fe19eb85107567d Author: Alexey Goncharuk <alexey.goncharuk@...> Date: 2017-06-14T18:37:54Z GG-12354: Partial fix of IGNITE-5473: Introduce troubleshooting logger. commit beb2409cfe2045789443d47de735d879961d371e Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-23T09:26:06Z GG-12352: Forcible node drop makes cluster instable in some cases. Disable forcible node drop by default. commit 802f18fc250cbae8959192c78bb28dc525ed3cf7 Author: AMRepo <andrey.mashenkov@...> Date: 2017-06-22T21:24:57Z Fix compilation commit 39d2dec85a3c571dfdb1cd6189b53ae2413a5d22 Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-23T10:41:30Z Merge branch 'ignite-1.7.12-b2' into ignite-1.8.8 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java # modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java # modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java # modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.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/service/GridServiceProcessor.java # modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskThreadContextKey.java # modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java commit 96445156143b46b664f785b353463dd435ac342d Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-23T10:42:44Z Merge remote-tracking branch 'origin/ignite-1.8.8' into ignite-1.8.8 # Conflicts: # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java commit 7c569f15a80ab9301c21011d2c9159e311e46cef Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2017-06-23T10:48:10Z Merge remote-tracking branch 'origin/ignite-1.8.7.p1' into ignite-1.8.8 commit bfec212b1ece0e9e791de6dfb642324834fa77ca Author: AMRepo <andrey.mashenkov@...> Date: 2017-06-22T21:24:57Z Partially reverted GG-12352. ---- ---