GitHub user AMashenkov opened a pull request: https://github.com/apache/ignite/pull/2623
Ignite-1.9.7 You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-1.9.7 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/2623.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 #2623 ---- commit 1985496ea98f4d7112a0b99727297427f343e9b2 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-04-17T07:20:41Z Add missed license headers. commit ae794ab45b22abe1e570d5d29661396ea7c0f951 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-04-17T10:40:28Z IGNITE-4159 Fix version. commit bf1049741f7a64728bd433f78262ba273f969848 Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-04-17T16:00:30Z IGNITE-4954 - Configurable expiration timeout for Cassandra session. This closes #1785. commit 86c49514c64225059a31912fdccadc6dc68a8397 Author: sboikov <sboi...@gridgain.com> Date: 2017-04-18T08:15:44Z ignite-4932 For offheap_tiered cache first try read value without cache entry creation commit aca67066ceaf762fcd44ef0715a4ba0f941226a8 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-04-18T09:23:28Z Merge branch 'ignite-1.8.5-p1' into ignite-1.8.6 commit cf75471a8daa69aa31c4029a728d23cca3cb7789 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-04-18T09:31:10Z Merge branch 'ignite-1.8.5-p1' into ignite-1.9.2 # Conflicts: # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlOperationType.java # modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java commit 320def0b0cc357cfae4423352623ead7aa1d5984 Author: Alexander Belyak <alexandr.bel...@xored.com> Date: 2017-04-18T11:56:50Z IGNITE-4927: Write behind - add an option to skip write coalescing commit c48322b79cafb561211501813c805aebd4b85540 Author: Valentin Kulichenko <valentin.luliche...@gmail.com> Date: 2017-04-13T08:29:30Z IGNITE-4954 - Configurable expiration timeout for Cassandra session. This closes #1785. commit 1c1a2f3e86c091bbbd2668db1cc7d72ff13d91ec Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-04-19T10:27:49Z Fix merge ignite-1.8.5-p1 commit ea3e625fe1269383d46d0be55adc85662a216792 Author: Alexander Belyak <alexandr.bel...@xored.com> Date: 2017-04-19T10:29:01Z IGNITE-4927 Use write behind coalescing from CacheConfiguration in GridCacheStoreManagerAdapter to configure actual cache store. Signed-off-by: nikolay_tikhonov <ntikho...@gridgain.com> commit c8155fd8c2b12ca69fd5877fd21327ec746e1225 Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com> Date: 2017-04-21T13:23:00Z ignite-1.9.2 backport of ignite-4949 commit 8cae6dfd7ed000d06b37ad53f5d04aa3fd534d66 Author: Alexander Belyak <alexandr.bel...@xored.com> Date: 2017-04-21T13:53:05Z IGNITE-4927 Use write behind coalescing from CacheConfiguration in GridCacheStoreManagerAdapter to configure actual cache store. Signed-off-by: nikolay_tikhonov <ntikho...@gridgain.com> commit 0d4d3cc36b17b9dcda8be02f9931ba01213f007f Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-04-21T16:40:08Z Merge branch 'ignite-1.7.10' into ignite-1.9.2 # Conflicts: # modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/datasource/DataSource.java # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java commit da3a1bd399832a8c012a5bd5ce1f07fe178cb8a6 Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-04-21T16:41:16Z Merge remote-tracking branch 'origin/ignite-1.9.2' into ignite-1.9.2 commit fde6d4427131f4b74fcdf88f1caae4f57d225a87 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2017-04-20T16:39:45Z IGNITE-5043 .NET: CacheConfiguration.WriteBehindCoalescing (cherry picked from commit 217c6be) commit 474add7c79eb5c57b2f88ca71ceb58ed3e5cb20b Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-04-24T11:52:07Z IGNITE-5043 .NET: CacheConfiguration.WriteBehindCoalescing Fix merge. commit a4c70f12305c15cbf15a6e5eb7c500f883a8b317 Author: agura <ag...@apache.org> Date: 2017-04-20T17:45:58Z ignite-5041 NPE in deadlock detection fixed commit a1fec4b0b3ddcc208154114e0bf8f202eb597fc9 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-04-25T06:14:07Z Fix index initialization. commit d94172e7bb7ff4ebab422997e5c70f8cd03c0ae4 Author: agura <ag...@apache.org> Date: 2017-04-26T12:16:46Z Redundant test removed commit c64dc2426a70896116dbdffbf90faea5e52b991c Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-04-27T13:35:25Z Revert IGNITE-4863 partially. Warn user if default log level was changed. As default log level value (DEBUG) can cause performance issues. commit f9ecacc625b458539775e6550bd9b7613ed38f21 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-04-28T08:46:23Z IGNITE-5077 - Support service security permissions backport from master (cherry picked from commit 6236b5f) 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 7d8d672295e6554a82f63a16b73c330ca6050618 Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-05-05T11:29:59Z IGNITE-4992: Fix Segmented SQL Index self tests. - Fixes #1801. Signed-off-by: Sergi Vladykin <sergi.vlady...@gmail.com> (cherry picked from commit 0c0cf2c00355ae2aec340473ed19dc5f0e0ddef0) commit 61c118f7b8097c554d7e2e4a09133fe3978d73d7 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Date: 2017-04-19T10:55:02Z IGNITE-4993 - Fixing distributed joins on segmented index. (cherry picked from commit 800b8bd) commit 1a4c1b66f7122b4fadc57f6047caf80dfe75e2f4 Author: AMRepo <andrey.mashen...@gmail.com> Date: 2017-05-05T22:21:46Z Fix segmented index snapshot usage. ---- ---