[GitHub] ignite pull request #1383: IGNITE-3875

[andrey-kuznetsov]

GitHub user devozerov opened a pull request:

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

    IGNITE-3875

   

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

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

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

    https://github.com/apache/ignite/pull/1383.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 #1383
   
----
commit 9beeee25a643ac97b2a832179d669397d552d2a3
Author: AMRepo <[hidden email]>
Date:   2016-10-19T16:05:19Z

    Implemented

commit 0862db26623db5bde0c744f4b3536a10fd7b3e52
Author: AMRepo <[hidden email]>
Date:   2016-10-19T16:05:19Z

    Implemented

commit f9304121945f07b3785d07518e435bc964233f2f
Author: AMRepo <[hidden email]>
Date:   2016-10-19T18:46:33Z

    Minors

commit c17ff0e716cdbaf759e0f34bbbf7834b87198d0a
Author: AMRepo <[hidden email]>
Date:   2016-10-19T18:55:50Z

    Merge remote-tracking branch 'origin/ignite-3875' into ignite-3875
   
    # Conflicts:
    # modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java

commit c8f78c3e4a69fb001c8995bb1f9c204da7415403
Author: Andrey V. Mashenkov <[hidden email]>
Date:   2016-10-20T10:12:21Z

    Merge branch 'ignite-1.6.11' into ignite-3875

commit 380a0b8a01a2ae4c606dbf67b588896ca7be435b
Author: vozerov-gridgain <[hidden email]>
Date:   2016-10-20T11:58:55Z

    Fixed receiver serialization problem.

commit 0f927608fe7b10f6c79b24b87b5eeecd46f68717
Author: vozerov-gridgain <[hidden email]>
Date:   2016-10-20T11:59:15Z

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

commit 448d6f594dfb484aa471c186fec80bb0e54949d6
Author: Andrey V. Mashenkov <[hidden email]>
Date:   2016-10-20T12:05:37Z

    Fixed receiver serialization problem.

commit c893da70a9757b16b0799adc8eaa29fa1b03d06e
Author: tledkov-gridgain <[hidden email]>
Date:   2016-12-21T11:54:33Z

    IGNITE-4399: IGFS: Merged IgfsSecondaryFileSystem and IgfsSecondaryFileSystemV2 interfaces. This closes #1346.

commit c5882a85f4e3a1f61723ac54fd92f087684df6da
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:15:42Z

    Merge branch 'master' into ignite-2.0

commit 248eaa710b11982831f71ed6733d125a5bae6871
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:21:50Z

    Merge branch 'ignite-2.0' into ignite-3875
   
    # Conflicts:
    # modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.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/datastreamer/DataStreamProcessor.java
    # modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
    # modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java

commit 1d0a10c8a48de51e122821e2c3b47b0fff83ac7f
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:23:41Z

    Fixes after merge.

commit 1883359d5ddc8deaddebb35b30e135ad18333070
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:23:51Z

    Fixes after merge.

commit 13e514e99a715ce8a276c7fd1aa12f384a727015
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:31:45Z

    Fixes after review.

commit 34aef7c17a59b9fdcc3df70382cb84dca1577a4b
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:39:58Z

    Minors.

commit b39ae48535ed5ca1ec0bab7b8d64d6b1fe5d3715
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:42:07Z

    Minors.

commit 87f103f92aeda9939e536b878f281b57aa1c31f2
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:44:02Z

    Minors.

commit af5e0482d767bd79fa152c486d991628d928827c
Author: devozerov <[hidden email]>
Date:   2016-12-26T11:47:26Z

    Minors.

----


---
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.
---

[andrey-kuznetsov]

Github user devozerov closed the pull request at:

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


---
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.
---