GitHub user avinogradovgg opened a pull request: https://github.com/apache/ignite/pull/1440
Ignite 3699 2 You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-3699-2 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/1440.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 #1440 ---- commit 5ffb8a74d08d998f8258770669ecb240db41964f Author: sboikov <sboi...@gridgain.com> Date: 2016-11-22T11:39:14Z Merge remote-tracking branch 'remotes/community/ignite-1.7.4' # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java commit 9d82f2ca06fa6069c1976cc75814874256b24f8c Author: devozerov <voze...@gridgain.com> Date: 2016-11-22T12:05:29Z IGNITE-4259: Fixed a problem with geospatial indexes and BinaryMarshaller. commit e91c15073eb0f9677c8a358a21497e7a6956200f Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-22T12:57:52Z IGNITE-4261 .NET: Fix ScanQuery tests: revert some changes from 6578c8b1e2dc57861da7ce448bc9f752ddecdf3a commit a753d2b58c66364e0d0ebcc3543a7af80e5d15f7 Author: Denis Magda <dma...@gridgain.com> Date: 2016-11-22T15:48:23Z IGNITE-4238: Added missing ASF header commit 93c3ccd01228394f9d95620ccd2c1f68d1e0b22c Author: devozerov <voze...@gridgain.com> Date: 2016-11-23T08:17:58Z Merge branch 'ignite-1.7.4' commit b038730ee56a662f73e02bbec83eb1712180fa82 Author: isapego <igors...@gmail.com> Date: 2016-11-23T09:05:54Z IGNITE-4249: ODBC: Fixed performance issue caused by ineddicient IO handling on CPP side. This closes #1254. commit 86d143bb8bdbdccba9209762b1fd802d5dc40268 Author: Alexander Paschenko <alexander.a.pasche...@gmail.com> Date: 2016-11-23T09:58:26Z IGNITE-2294: Implemented DML. commit 4ba1386987cdd7ee26c14a6d599d6c6a970ca08a Author: devozerov <voze...@gridgain.com> Date: 2016-11-23T14:56:50Z Merge branch 'ignite-1.7.4' into ignite-1.8 commit f4524a6a7b86df9cd008dcd22fa5cfa400c3af27 Author: isapego <igors...@gmail.com> Date: 2016-11-23T14:58:41Z IGNITE-4096: Added ODBC-DML tests. Fixed issues. This closes #1178. commit 83363d8e0cab93b62f674ce0215082364881254b Author: isapego <igors...@gmail.com> Date: 2016-11-23T15:07:06Z IGNITE-4016: ODBC: Example now uses DML. This closes #1265. commit 4d243251006bc8d1de85d7b6a481976899755a82 Author: isapego <igors...@gmail.com> Date: 2016-11-23T15:11:35Z IGNITE-3910: ODBC: Implemented SQLDescribeParam. This closes #1269. commit 91385256a55f083d8973e5d5b0445f28182d36f2 Author: sboikov <sboi...@gridgain.com> Date: 2016-11-24T07:45:03Z ignite-3955 added test commit 7a47a0185d308cd3a58c7bfcb4d1cd548bff5b87 Author: devozerov <voze...@gridgain.com> Date: 2016-11-24T08:14:08Z IGNITE-4270: Allow GridUnsafe.UNALIGNED flag override. commit bf330251734018467fa3291fccf0414c9da7dd1b Author: Andrey Novikov <anovi...@gridgain.com> Date: 2016-11-24T10:08:08Z Web console beta-6. commit e43ea5ee9b6982b2b2086fd2a678882d24c1654c Author: Andrey Novikov <anovi...@gridgain.com> Date: 2016-11-24T10:12:07Z Merge branch 'ignite-1.7.4' into 'ignite-1.8'. commit 7d88c5bfe7d6f130974fab1ed4266fff859afd3d Author: Andrey Novikov <anovi...@gridgain.com> Date: 2016-11-24T10:59:33Z Web console beta-6. Minor fix. commit d2b915e50c8e3cbe07f565f14d14474342662550 Author: Andrey Novikov <anovi...@gridgain.com> Date: 2016-11-24T11:01:31Z Merge branch 'ignite-1.7.4' into 'ignite-1.8'. commit 4a758d1a6285f9441af7c894e2a31e0df895cb03 Author: isapego <igors...@gmail.com> Date: 2016-11-24T12:49:08Z IGNITE-4288: ODBC: Fixed DML interoperability. This closes #1272. commit d5dc5815416cc13f7b2b8a323fa5a39ec95ecb95 Author: isapego <igors...@gmail.com> Date: 2016-11-24T12:53:35Z IGNITE-4299: ODBC Minor example fix. This closes #1277. commit 9c6824b4f33fbdead64299d9e0c34365d5d4a570 Author: nikolay_tikhonov <ntikho...@gridgain.com> Date: 2016-11-24T13:27:05Z IGNITE-3958 Fixed "Client node should not start rest processor". commit 9326f9a5c081f3ba434dade7e9541c46e4ad1cea Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-24T13:32:02Z IGNITE-4297 .NET: Update NuGet scripts to clean up jars in bin folder commit c4badeef809851c1ab890e2d6358834f698e94ad Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-24T13:32:02Z IGNITE-4297 .NET: Update NuGet scripts to clean up jars in bin folder commit 56998e704e9a67760c70481c10c56e72c0a866bb Author: Konstantin Dudkov <kdud...@ya.ru> Date: 2016-10-28T13:27:34Z ignite-4088 Added methods to create/destroy multiple caches. This closes #1174. (cherry picked from commit f445e7b) commit fabb77d17859a0a6318c2fe11182ab753e2198e0 Author: Alexander Paschenko <alexander.a.pasche...@gmail.com> Date: 2016-11-24T15:51:07Z IGNITE-4280 Test fix for IgniteBinaryCacheQueryTestSuite. This closes #1275. commit deee3b9f64406e084e65c1f7e48e14270e8ad688 Author: devozerov <voze...@gridgain.com> Date: 2016-11-25T08:15:17Z Fixed JavaDoc warnings in Redis REST classes. commit 7b35ba730edbb91a30a59b1efdc22eceea7298e1 Author: devozerov <voze...@gridgain.com> Date: 2016-11-25T08:22:05Z IGNITE-4270: Fixed system property name. commit b04460c6b3ad5891f12a23ad6dc8a08625aad031 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-25T09:11:49Z IGNITE-4306 .NET: Add diagnostic information to examples test commit 3f797b67384f6237a51d358727bc406c5610d0cf Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-25T09:36:46Z .NET: Remove unused code, sort example tests commit 0822dc2370e75427078875bcd67051eb9cd44779 Author: devozerov <voze...@gridgain.com> Date: 2016-11-25T09:38:13Z IGNITE-2294: Fixed incorrect merge of BinaryObjectOffheapImpl.typeId(). commit ccbe60076f32edc642515351cb69044dabea3436 Author: devozerov <voze...@gridgain.com> Date: 2016-11-25T09:38:45Z Merge remote-tracking branch 'origin/ignite-1.8' into ignite-1.8 ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---