[GitHub] ignite pull request #2899: ignite 12992

[andrey-kuznetsov]

GitHub user ntikhonov opened a pull request:

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

    ignite  12992

   

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

    $ git pull https://github.com/gridgain/apache-ignite ignite-gg-12992

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

    https://github.com/apache/ignite/pull/2899.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 #2899
   
----
commit 0c5bf92a56eb4df089291bafe4a2cf76bf14982c
Author: Andrey V. Mashenkov <[hidden email]>
Date:   2017-06-05T09:48:44Z

    Merge branch 'ignite-1.8.7' into ignite-1.9.4
   
    # 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/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
    # modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
    # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.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

commit 374cba8a2b0d4438b46258a4ea89e43ab1e7989c
Author: dkarachentsev <[hidden email]>
Date:   2017-06-06T13:17:01Z

    IGNITE-5259 Minor serialization fix

commit 5cb580ad7043f27e4a0396aea1f877c21d49078e
Author: dkarachentsev <[hidden email]>
Date:   2017-06-06T13:17:01Z

    IGNITE-5259 Minor serialization fix
   
    (cherry picked from commit 374cba8)

commit f03252f9b2c6f0e777f307fd85cc8bd20ab21423
Author: dkarachentsev <[hidden email]>
Date:   2017-06-06T13:17:01Z

    IGNITE-5259 Minor serialization fix
   
    (cherry picked from commit 374cba8)

commit d2bf9619aaf867f251bc193d913dd4cc174a33a3
Author: Ivan Veselovskiy <[hidden email]>
Date:   2017-06-06T13:56:09Z

    IGNITE-5410: Fixed assertion in HadoopDataOutStream. This closes #2084.

commit 77ff30cc08dae653c0b914167088e9e90cdadd32
Author: dkarachentsev <[hidden email]>
Date:   2017-06-06T14:12:27Z

    IGNITE-5259 Minor serialization fix

commit be2bf6509816d2dc25fe9798b746a0f5c9014124
Author: dkarachentsev <[hidden email]>
Date:   2017-06-06T14:12:42Z

    Merge remote-tracking branch 'origin/ignite-1.9.3' into ignite-1.9.3

commit 3a1d560cd8741de9e7a6dd1110b42814d0ccff6b
Author: dkarachentsev <[hidden email]>
Date:   2017-06-06T14:13:52Z

    IGNITE-5259 Minor serialization fix

commit 56d4ce8a042238654ab96235d1a2969107b8881c
Author: devozerov <[hidden email]>
Date:   2017-06-06T14:39:33Z

    GG-12244: Fixed a bug in GridH2IndexRangeRequest serialization mechanics.

commit f1b8a7d8407fbc990e7027b17e366d30f05c1ab6
Author: devozerov <[hidden email]>
Date:   2017-06-06T14:40:01Z

    Merge remote-tracking branch 'upstream/ignite-1.9.3' into ignite-1.9.3

commit cfbe8da934741e76c8964af87671a38ec7b6c9a3
Author: dkarachentsev <[hidden email]>
Date:   2017-06-06T16:15:59Z

    IGNITE-5103 Rolled back due to test failings.

commit 83307da08289c873c5c2eb02d5eb314018bc5c13
Author: Ivan Veselovskiy <[hidden email]>
Date:   2017-06-06T13:56:09Z

    IGNITE-5410: Fixed assertion in HadoopDataOutStream. This closes #2084.
   
    (cherry picked from commit d2bf961)

commit e95626d609ee225918b49653b7981b180e5d4e49
Author: Evgenii Zhuravlev <[hidden email]>
Date:   2017-06-01T16:56:34Z

    SSL fix
   
    (cherry picked from commit 95d5595)

commit 340204637a03e5533685f1b11ca65c9121f6e193
Author: Alexei Kaigorodov <[hidden email]>
Date:   2017-06-08T16:37:40Z

    IGNITE-5103 Rolled back due to test failings. (#69)

commit f3f726e9059e492573dc5125fd5edb5d2f71e9d3
Author: Andrey V. Mashenkov <[hidden email]>
Date:   2017-06-13T11:11:17Z

    IGNITE-4196: Added means to specify port for H2 debug console. This closes #1486.
   
    (cherry picked from commit b246260)

commit c2c237d1222557d3e6b35d9a51a61a4c78e56782
Author: Sergey Kalashnikov <[hidden email]>
Date:   2017-02-03T08:41:14Z

    IGNITE-4196: Added means to specify port for H2 debug console. This closes #1486.
   
    (cherry picked from commit b246260)

commit 4a8f295f2f2f34e8472b1d1320f03744135b2504
Author: Igor Sapego <[hidden email]>
Date:   2017-06-13T16:47:00Z

    IGNITE-5478: ODBC: SQLNumParams now returns number of required parameters.
   
    (cherry picked from commit b1c56a1)

commit a2a4ec1ee9794cb542f146a07c6c67002cad444e
Author: Igor Sapego <[hidden email]>
Date:   2017-06-14T09:16:43Z

    IGNITE-5478: Fix for cherry pick

commit d268b32cb252a5f06887d2b803d27ddc20ded95f
Author: Igor Sapego <[hidden email]>
Date:   2017-06-16T09:27:35Z

    IGNITE-4370: Implemented writing of batch of parameters for ODBC.
   
    (cherry picked from commit c10be5780589cc84e7929e234e4411d515166e0b)

commit 7fbaecc67f1b204162bda4595d6c118ddd45f963
Author: Andrey V. Mashenkov <[hidden email]>
Date:   2017-06-16T17:01:49Z

    IGNITE-5527: Prevent starvation in stripe pool on unstable topology.

commit f81964f59b0ea5b8dfdc8eb2acc34d2a5b8fee07
Author: sboikov <[hidden email]>
Date:   2017-01-10T13:59:17Z

    Do not evict removed entries, otherwise removes can be lost.
   
    (cherry picked from commit 55ac6e7)

commit 38f0ea80f3d95be16b38b621b3bcc2910c463997
Author: sboikov <[hidden email]>
Date:   2017-01-10T13:59:17Z

    Do not evict removed entries, otherwise removes can be lost.
   
    (cherry picked from commit 55ac6e7)

commit 5dd74ff635de50ff9561ccdb51bdeb620f60c3db
Author: sboikov <[hidden email]>
Date:   2017-01-10T13:59:17Z

    Do not evict removed entries, otherwise removes can be lost.
   
    (cherry picked from commit 55ac6e7)

commit 799ef99b512fffb90b97d926532bc6b9404efbff
Author: Evgenii Zhuravlev <[hidden email]>
Date:   2017-06-21T08:56:53Z

    Merge remote-tracking branch 'remotes/origin/ignite-1.9.3' into ignite-1.9.4

commit c802b478ef47271f5b8864e0b0ae29925107e75f
Author: agura <[hidden email]>
Date:   2017-06-21T15:52:17Z

    Compilation is fixed

commit 5fb5c7e3b54ae4efb7a6a1832ba647677d93e0cd
Author: Evgenii Zhuravlev <[hidden email]>
Date:   2017-06-22T06:43:03Z

    IGNITE-5399 Manual cache rebalancing feature is broken

commit 01d41b72ecc3e81dfc8966cc0e395c247037241c
Author: Evgenii Zhuravlev <[hidden email]>
Date:   2017-06-21T10:48:15Z

    GG-12256 H2Indexes are not deleted if key class implements Externalizable

commit 5ac9afc719138e37a7d97d9d9db05243eee9a942
Author: Evgenii Zhuravlev <[hidden email]>
Date:   2017-06-22T09:36:14Z

    IGNITE-5399 add test to testsuite

commit a935d40a80e2f928a84a145aba540a45b156687f
Author: Evgenii Zhuravlev <[hidden email]>
Date:   2017-06-22T12:10:32Z

    GG-12256 Minor fixes

commit 7e2468770a4eb47a4f61204d8c2000b6ab67c967
Author: nikolay_tikhonov <[hidden email]>
Date:   2017-06-22T13:13:01Z

    IGNITE-GG-12197 Fixed "Ignore events for discarded update in CLOCK mode".
   
    Signed-off-by: nikolay_tikhonov <[hidden email]>

----


---

[andrey-kuznetsov]

Github user ntikhonov closed the pull request at:

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


---