GitHub user isapego opened a pull request:
https://github.com/apache/ignite/pull/3708
IGNITE-4193: Added transaction support for ODBC
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/gridgain/apache-ignite ignite-4193
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/3708.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 #3708
----
commit 3155f6bc8884f61d786dc4ef24c4925fd10fc8c5
Author: sboikov <sboikov@...>
Date: 2017-10-25T09:39:23Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.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/cache/persistence/RowStore.java
#
modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
commit 00bd4794ab33725d9bca22eaf1b29bb3f0e71c2b
Author: sboikov <sboikov@...>
Date: 2017-10-25T09:40:14Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.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/cache/persistence/RowStore.java
#
modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
commit 6150f3a0ad310810606ec5bafbd007804808ff25
Author: sboikov <sboikov@...>
Date: 2017-10-25T12:15:56Z
ignite-3478 Mvcc support for sql indexes
commit 2a2a2c4593bdf1708894ccbe5031708a60b097e7
Author: sboikov <sboikov@...>
Date: 2017-10-26T08:15:34Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
commit 980517fb1a905447471b53a8fdae1eea46331c7d
Author: sboikov <sboikov@...>
Date: 2017-10-26T10:11:02Z
ignite-3478 Tests with persistence enabled.
commit 987a57e3371c4f82fc51706539746fcd2736a034
Author: sboikov <sboikov@...>
Date: 2017-10-26T13:07:18Z
ignite-3478 Support for cache groups.
commit e37dfa3b9a96d13ba38dc4c564ebeb4d0bccefa1
Author: sboikov <sboikov@...>
Date: 2017-10-27T07:53:33Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
commit 39f7ae974a222b63c6a91b1df6cf669266a3e911
Author: sboikov <sboikov@...>
Date: 2017-10-27T07:58:14Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
commit 68b61f6f59279f2ea01f152018a33b0f878f75b4
Author: sboikov <sboikov@...>
Date: 2017-10-27T08:22:20Z
ignite-3478 Added missed serialVersionUID
commit f8c5cc5dcce9c2219b68c923221e901cae35733b
Author: sboikov <sboikov@...>
Date: 2017-10-27T08:47:24Z
ignite-3478 Fixed compilation
commit b04849ea6e1313b0e9d8b2646b08914f8cfa3a7b
Author: sboikov <sboikov@...>
Date: 2017-10-27T10:40:26Z
ignite-3478 Fix tests
commit d46a039506be32c1b472903525392fd3500e9c13
Author: sboikov <sboikov@...>
Date: 2017-10-27T11:52:13Z
ignite-3478 Fix tests
commit 6466adf54f017219a16cf9835ee0214853db269e
Author: sboikov <sboikov@...>
Date: 2017-10-27T12:14:39Z
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
commit ecdeff85ebc63dfee02635113dbfcad98d235a31
Author: sboikov <sboikov@...>
Date: 2017-10-27T14:09:47Z
ignite-3478 add test
commit 84f5c0f2d8d48be207b9094fc3812f31f1c12b15
Author: Igor Seliverstov <gvvinblade@...>
Date: 2017-11-02T12:38:20Z
Merge branch 'master' into ignite-3478
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java
commit 066f0aed9484160a39e75e4e3c4a92b285707e9e
Author: Igor Seliverstov <gvvinblade@...>
Date: 2017-11-08T09:47:14Z
IGNITE-6709 Support mvcc filter for H2TreeIndex.findFirstOrLast
commit e1d80187a17b9a926511cc9fb316896a3c60e3d1
Author: Igor Seliverstov <gvvinblade@...>
Date: 2017-11-09T16:03:11Z
Merge branch 'master' into ignite-3478
commit 694b94c6ad9fe119fddecc72aa67bbf49413e10b
Author: Igor Seliverstov <gvvinblade@...>
Date: 2017-11-10T08:34:50Z
Merge branch 'master' into ignite-3478
commit 23cae6695db34d8369abb395001ce3e1b88a6394
Author: devozerov <vozerov@...>
Date: 2017-11-10T09:55:15Z
Minors.
commit fdfcd0b74665f23386c85e559b7d2abe3493a939
Author: devozerov <vozerov@...>
Date: 2017-11-10T09:57:38Z
Minors.
commit c741264aec7fb6f37467061b2f8bc06d59688b59
Author: devozerov <vozerov@...>
Date: 2017-11-10T11:56:27Z
Merge branch 'master' into ignite-3478
commit c32324ab935db70c8653871afee47aeb250726bc
Author: devozerov <vozerov@...>
Date: 2017-11-10T12:05:59Z
Minors.
commit 2387bf978cd0bedba3a2840cce6442f61021464a
Author: devozerov <vozerov@...>
Date: 2017-11-10T12:09:50Z
Cosmetics.
commit 61c982ae614b014150111faa0f42295b411db25b
Author: Igor Seliverstov <gvvinblade@...>
Date: 2017-11-10T12:16:23Z
IGNITE-6738 Support mvcc filter for local sql queries
commit 2449f43f1e23e51e167b228d375c6cde8ec7ef59
Author: Igor Seliverstov <gvvinblade@...>
Date: 2017-11-10T12:17:20Z
Merge branch 'ignite-3478' of github.com:gridgain/apache-ignite into
ignite-3478
commit d88b8f1b24d65e99234a974967a4e7babee9056e
Author: devozerov <vozerov@...>
Date: 2017-11-10T12:44:15Z
Cosmetics.
commit c15d2b01a04fac5e2674d151e1c111a34b3d6fa7
Author: devozerov <vozerov@...>
Date: 2017-11-10T12:45:13Z
Merge remote-tracking branch 'upstream/ignite-3478' into ignite-3478
commit 4546d27b7902f38c757d5d2d13d8885c2c92e49a
Author: Igor Seliverstov <gvvinblade@...>
Date: 2017-11-13T09:14:43Z
Merge branch 'master' into ignite-3478
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
commit 9211f39f6af04238413fee38d046be6e44db68ab
Author: Alexander Paschenko <alexander.a.paschenko@...>
Date: 2017-11-13T08:48:43Z
Merge branch 'master' into ignite-5571
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
#
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
#
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
commit 13a2f43b3a1b4e57073d743d1d581710f334808a
Author: devozerov <vozerov@...>
Date: 2017-11-13T10:01:24Z
Merge remote-tracking branch 'upstream/ignite-3478' into ignite-3478
----
---
