[GitHub] ignite pull request #1187: ignite-gg-11645-merge

[andrey-kuznetsov]

GitHub user ascherbakoff opened a pull request:

    https://github.com/apache/ignite/pull/1187

    ignite-gg-11645-merge

    Merge query cancellation to 1.7. For CI only.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/ascherbakoff/ignite ignite-gg-11645-merge

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/ignite/pull/1187.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 #1187
   
----
commit 771ba96456cfd83fe8f3a5e93dd9db0817d826eb
Author: Aleksei Scherbakov <[hidden email]>
Date:   2016-10-19T12:35:25Z

    Merge branch 'ignite-1.7.3' into ignite-gg-11645-merge
   
    # Conflicts:
    # modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
    # modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
    # modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesTransformer.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/GridIoPolicy.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosurePolicy.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
    # modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredBinaryTestSuite.java
    # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
    # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
    # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
    # modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
    # modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
    # modules/platforms/cpp/core/src/impl/interop/interop_target.cpp
    # modules/platforms/cpp/jni/include/ignite/jni/exports.h
    # modules/platforms/cpp/jni/include/ignite/jni/java.h
    # modules/platforms/cpp/jni/src/exports.cpp
    # modules/platforms/cpp/jni/src/java.cpp
    # modules/platforms/cpp/odbc/src/odbc.cpp
    # modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
    # modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
    # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs
    # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheOp.cs
    # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
    # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
    # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
    # modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java

commit 1c30d1ebbedc55c39532c84a8d092035a5ef194d
Author: Aleksei Scherbakov <[hidden email]>
Date:   2016-10-19T16:11:45Z

    GG-11645 Fixing issues.

commit dd8d899a711c72b5fc89682b3bb662c2284e026d
Author: ascherbakoff <[hidden email]>
Date:   2016-10-24T20:53:53Z

    GG-11645 Fixing tests.

commit fec421e69481761df9661fbd3fafb74d25e87dd2
Author: Aleksei Scherbakov <[hidden email]>
Date:   2016-10-26T13:00:16Z

    GG-11645 Fixing issues.

----


---
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 [hidden email] or file a JIRA ticket
with INFRA.
---