GitHub user alexpaschenko opened a pull request:
https://github.com/apache/ignite/pull/1685 Ignite 4868
You can merge this pull request into a Git repository by running:
$ git pull
https://github.com/gridgain/apache-ignite ignite-4868
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/1685.patchTo close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1685
----
commit 59ea1c2fa87ee6a9e09f9bf7afc2b1ec8ff205ac
Author: nikolay_tikhonov <
[hidden email]>
Date: 2017-03-16T10:43:50Z
Merge remote-tracking branch ignite-1.7.9 into ignite-1.8.5
Conflicts:
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
Merge remote-tracking branch ignite-1.7.9 into ignite-1.8.5
Conflicts:
docs/RELEASE_NOTES.txt
docs/community/RELEASE_NOTES.txt
modules/compatibility/src/test/java/org/gridgain/grid/compatibility/tests/GridCompatibilityAbstractTest.java
modules/core/src/main/resources/gridgain.properties
commit 946419314b567c604a15ae4f9658d89bc350127b
Author: dkarachentsev <
[hidden email]>
Date: 2017-03-17T11:57:48Z
IGNITE-4473 - Client should re-try connection attempt in case of concurrent network failure.
(cherry picked from commit d124004)
commit f4232e9557fca89065f4ee424afab940265e2d1b
Author: oleg-ostanin <
[hidden email]>
Date: 2017-03-21T12:32:33Z
IGNITE-4822 Fixed change jvm options for benchmarks
commit 6e2bc4bfb0b200e59c9fc3cf4fcbd408d52acb9c
Author: Igor Sapego <
[hidden email]>
Date: 2017-03-21T14:51:40Z
IGNITE-4200: Added copying of the C++ binaries.
commit 3aa2a68c02879ec57c46091cd2f22a9ac4b129ad
Author: dkarachentsev <
[hidden email]>
Date: 2017-03-22T12:22:50Z
Merge branch 'ignite-1.7.9-p1' into ignite-1.8.5
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
commit 8ac955cda895fb8e47651967ee6c49b06c89b397
Author: Alexander Paschenko <
[hidden email]>
Date: 2017-03-28T10:00:17Z
IGNITE-4868 Correct handling of JDK Object with binary marshaller
----
---
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.
---
Locked
