GitHub user AMashenkov opened a pull request: https://github.com/apache/ignite/pull/3153
Ignite 1267 1.x For test purposes You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-1267-1.x Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/3153.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 #3153 ---- commit 91c899b909383c78b78b9bf0c8f233b8c75ef29e Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Date: 2017-04-28T12:48:57Z IGNITE-5081 - Removed redundant duplication of permissions in SecurityPermissionSetBuilder commit b48a26b9b1e97fb8eb52c2a2f36005770922ac3d Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Date: 2017-04-28T12:53:33Z IGNITE-5080 - Fixes in SecurityBasicPermissionSet commit f66c23cbb9a6f2c923ebf75c58f00afaf1c0b5f3 Author: Evgenii Zhuravlev <ezhurav...@gridgain.com> Date: 2017-05-03T14:47:45Z IGNITE-4939 Receive event before cache initialized fix commit 45b4d6316145d0b4b46713409f5e8fbe55ff4c41 Author: Evgenii Zhuravlev <ezhurav...@gridgain.com> Date: 2017-05-04T09:11:37Z IGNITE-4939 Receive event before cache initialized fix commit 075bcfca0ea22633be13cd02647e359ad6fdca16 Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-04T09:21:04Z Fix flacky service deployment tests. commit 25c06b50d46937cb39534cdf4147b862217289a2 Author: rfqu <r...@list.ru> Date: 2017-05-02T16:46:44Z ignite-4220 Support statements for JDBC and Cassandra store commit 987c182686962673e70398395cb27e94f894713b Author: nikolay_tikhonov <ntikho...@gridgain.com> Date: 2017-05-15T08:54:16Z Fixed "IGNITE-5214 ConcurrentModificationException with enable DEBUG log level" Signed-off-by: nikolay_tikhonov <ntikho...@gridgain.com> commit a5d2b9ba3ed1e72ef3970ecfed499a97f925ff2c Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-15T14:39:52Z Fixed thread pools incorrect shutdown. (cherry picked from commit dacf973) commit 5e08c2951522a640bf84b6c60f03f29edd970ffc Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-15T17:24:10Z IGNITE-5225: Fix NPE caused by changes in IGNITE-4577. (cherry picked from commit d463840) commit 62765b5b7598ab2a82b9c595e4a1276d9f2f5860 Author: sboikov <sboi...@gridgain.com> Date: 2017-05-16T08:30:29Z DirectByteBufferStreamImpl: converted asserts into exceptions. (cherry picked from commit 560ef60) commit ebc4a1648a80fbbd485e4c351fce9bee163318f9 Author: sboikov <sboi...@gridgain.com> Date: 2017-05-16T08:30:29Z DirectByteBufferStreamImpl: converted asserts into exceptions. (cherry picked from commit 560ef60) commit a609dc7a0bb2d923ecf79a25fb4c13f48eab5f5b Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-16T12:36:22Z Merge branch 'ignite-1.8.7.b1' into ignite-1.8.7 commit 9cd7e0f8d132f9b7c496fe64f75f271ef60da5eb Author: Alexey Kuznetsov <akuznet...@apache.org> Date: 2017-02-09T09:44:41Z IGNITE-4676 Fixed hang if closure executed nested internal task with continuation. Added test. (cherry picked from commit e7a5307) commit 43bcc15127bd3fd7ac4e277da6da9e5fb6a855c0 Author: Vasiliy Sisko <vsi...@gridgain.com> Date: 2017-03-30T04:08:10Z IGNITE-4838 Fixed internal task detection logic. Added tests. (cherry picked from commit ba68c6c) commit 72882126c047b937bd5ed93c85e28262530e4977 Author: Vasiliy Sisko <vsi...@gridgain.com> Date: 2017-03-30T04:08:10Z IGNITE-4838 Fixed internal task detection logic. Added tests. (cherry picked from commit ba68c6c) commit 0d3d93cd4eeb589f1b6a11b48e429defad01c82f Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-05-18T16:11:08Z IGNITE-4842 Now containsKey() respects isReadFromBackup() flag. (cherry picked from commit d84fd29) commit 4bf9123a6cff3b1fd17e8772bb0496108fce3f5e Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-05-18T16:13:47Z Merge remote-tracking branch 'origin/ignite-1.8.7' into ignite-1.8.7 commit 2a818d36395dd1af23acf444adf396b2e2edbede Author: Konstantin Dudkov <kdud...@ya.ru> Date: 2017-05-22T13:28:07Z Fixed "IGNITE-4205 CassandraCacheStore should start IiteThread threads in loadCache() method" Signed-off-by: nikolay_tikhonov <ntikho...@gridgain.com> commit 04fadd4a499239176ba21c390d93e30809abb4c1 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-05-23T12:42:20Z IGNITE-5223 Allow use local binary metadata cache if it's possible commit b2040b7a95e421609bcf7ae05b56dc623310b409 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-05-23T13:14:08Z IGNITE-5259 Minor serialization fix commit b77428d12658b3ab2cdd43ca61ed71d329e83283 Author: sboikov <sboi...@gridgain.com> Date: 2017-01-10T13:59:17Z Do not evict removed entries, otherwise removes can be lost. (cherry picked from commit 55ac6e7) commit 29187ef6b663eafe67eaaaf38e4c09fc244ac7aa Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-05-24T14:31:27Z Do not evict removed entries, otherwise removes can be lost. Rollback due to test failings. commit 442aac2507210d39b7f30ab8f8d9a3dbe2610cae Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-24T15:32:11Z IGNITE-5225: Fix NPE caused by changes in IGNITE-4577. (cherry picked from commit d463840) commit b1736c0bd87d6cfb65f9ef422241e0f1aba04c8d Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-24T15:48:52Z Fixed thread pools incorrect shutdown. (cherry picked from commit 66cef22) commit 15d94b432fdfe458a826df6ad3c30a0408a93f49 Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-25T11:27:08Z Backport of IGNITE-4336: Manual rebalance can't be requested twice. (cherry picked from commit 9a691c4) commit 26072dffb8f5b28693731f8367872a8e1e6dfe7e Author: agura <ag...@apache.org> Date: 2017-05-18T16:40:09Z ignite-5203 Simple BLOB support added commit e105b4e5c9c04f966fa4ffcff0e49dc253f4f050 Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-30T13:40:24Z Merge remote-tracking branch 'origin/ignite-1.7.11' into ignite-1.8.7 # Conflicts: # modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java # modules/cassandra/store/src/test/java/org/apache/ignite/tests/IgnitePersistentStoreTest.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java # modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java # modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java # modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java Merge remote-tracking branch 'origin/ignite-1.7.11' into ignite-1.8.7 # Conflicts: # docs/RELEASE_NOTES.txt # docs/community/RELEASE_NOTES.txt # modules/compatibility/src/test/java/org/gridgain/grid/compatibility/tests/GridCompatibilityAbstractTest.java # modules/core/src/main/resources/gridgain.properties commit d77a134fffee431cd7fa0bae2349419bc97ec1cf Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-05-30T16:00:47Z IGNITE-5342 - Skip permission check for TASK_EXECUTE for service jobs commit d0186c368b12ab6893d0985e3fb92600708d5b65 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-05-30T16:00:47Z IGNITE-5342 - Skip permission check for TASK_EXECUTE for service jobs (cherry picked from commit d77a134) commit 0a0c5be1eb4793bc838da3184591d91537bd9cad Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-05-31T12:24:14Z Merge compilation fix. ---- ---