[GitHub] ignite pull request: Ignite 2969

[andrey-kuznetsov]

GitHub user agura opened a pull request:

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

    Ignite 2969

   

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

    $ git pull https://github.com/agura/incubator-ignite ignite-2969

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

    https://github.com/apache/ignite/pull/677.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 #677
   
----
commit 487071fc5c1a3f59edf72d65e6a51ee90786e3de
Author: Anton Vinogradov <[hidden email]>
Date:   2015-12-22T16:27:02Z

    Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2
   
    Conflicts:
    examples/pom.xml
    examples/schema-import/pom.xml
    modules/aop/pom.xml
    modules/apache-license-gen/pom.xml
    modules/aws/pom.xml
    modules/camel/pom.xml
    modules/clients/pom.xml
    modules/cloud/pom.xml
    modules/codegen/pom.xml
    modules/core/pom.xml
    modules/core/src/main/resources/ignite.properties
    modules/extdata/p2p/pom.xml
    modules/extdata/uri/modules/uri-dependency/pom.xml
    modules/extdata/uri/pom.xml
    modules/flume/pom.xml
    modules/gce/pom.xml
    modules/geospatial/pom.xml
    modules/hadoop/pom.xml
    modules/hibernate/pom.xml
    modules/indexing/pom.xml
    modules/jcl/pom.xml
    modules/jms11/pom.xml
    modules/jta/pom.xml
    modules/kafka/pom.xml
    modules/log4j/pom.xml
    modules/log4j2/pom.xml
    modules/mesos/pom.xml
    modules/mqtt/pom.xml
    modules/osgi-karaf/pom.xml
    modules/osgi-paxlogging/pom.xml
    modules/osgi/pom.xml
    modules/platforms/cpp/common/configure.ac
    modules/platforms/cpp/core-test/configure.ac
    modules/platforms/cpp/core/configure.ac
    modules/platforms/cpp/examples/configure.ac
    modules/platforms/cpp/ignite/configure.ac
    modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
    modules/rest-http/pom.xml
    modules/scalar-2.10/pom.xml
    modules/scalar/pom.xml
    modules/schedule/pom.xml
    modules/schema-import/pom.xml
    modules/slf4j/pom.xml
    modules/spark-2.10/pom.xml
    modules/spark/pom.xml
    modules/spring/pom.xml
    modules/ssh/pom.xml
    modules/tools/pom.xml
    modules/twitter/pom.xml
    modules/urideploy/pom.xml
    modules/visor-console-2.10/pom.xml
    modules/visor-console/pom.xml
    modules/visor-plugins/pom.xml
    modules/web/pom.xml
    modules/yardstick/pom.xml
    modules/yarn/pom.xml
    modules/zookeeper/pom.xml
    pom.xml
   
    Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2
   
    Conflicts:
    benchmarks/cache-comparison/pom.xml
    benchmarks/filesystem/hadoop1/pom.xml
    benchmarks/filesystem/hadoop2/pom.xml
    benchmarks/mongo/pom.xml
    benchmarks/risk-analytics/pom.xml
    benchmarks/serialization/pom.xml
    benchmarks/yardstick/src/main/dotnet/gridgain-benchmarks/Properties/AssemblyInfo.cs
    examples/pom.xml
    modules/clients/pom.xml
    modules/codegen/pom.xml
    modules/compatibility/pom.xml
    modules/core/pom.xml
    modules/core/src/main/resources/gridgain.properties
    modules/diagnostic/pom.xml
    modules/dr-demo/pom.xml
    modules/license-gen/pom.xml
    modules/mongo-sniffer/pom.xml
    modules/mongo-visor/pom.xml
    modules/mongo/pom.xml
    modules/platforms/cpp/core-test/configure.ac
    modules/platforms/cpp/core/configure.ac
    modules/platforms/cpp/examples/configure.ac
    modules/platforms/dotnet/examples/GridGainExamples/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/examples/GridGainExamplesDll/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/gridgain-examples-test/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/gridgain-exe/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/gridgain-test-compatibility/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/gridgain-test-dll/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/gridgain-test-runner/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/gridgain-test/Properties/AssemblyInfo.cs
    modules/platforms/dotnet/gridgain/Properties/AssemblyInfo.cs
    modules/tools/pom.xml
    modules/visor-console/pom.xml
    modules/visor-demo/pom.xml
    modules/visor-tester-plugin/pom.xml
    modules/visor-tester/pom.xml
    modules/visor/pom.xml
    modules/yardstick/dotnet/Properties/AssemblyInfo.cs
    modules/yardstick/pom.xml
    parent/pom.xml
    pilots/chronotrack/pom.xml
    pilots/ctb/pom.xml
    pilots/dsi/pom.xml
    pilots/ionic/pom.xml
    pilots/sb/pom.xml
    pilots/sony/pom.xml
    pilots/wellsfargo/pom.xml
    pilots/worldpay/pom.xml
    pom.xml

commit a88e96474c2c09a963ab47fe9be1f950d68964c0
Author: Ignite Teamcity <[hidden email]>
Date:   2015-12-22T16:48:17Z

    1.5.1.final-SNAPSHOT

commit fad8b7a5a25788193522554b47b3d425c4ff1a4f
Author: Anton Vinogradov <[hidden email]>
Date:   2015-12-24T09:34:30Z

    Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

commit 7049f52ee956a168b4dcb043a672a6a9eb04ce56
Author: Anton Vinogradov <[hidden email]>
Date:   2015-12-25T14:10:35Z

    Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

commit bbac649e89733775b02ba9af201638c59f6d373b
Author: Ignite Teamcity <[hidden email]>
Date:   2015-12-28T11:39:17Z

    1.5.1.final-SNAPSHOT

commit d62b90591b6ae36b1394daf17a40084e8a292504
Author: Anton Vinogradov <[hidden email]>
Date:   2015-12-28T12:20:38Z

    Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

commit 8e6b365eb873cf4fce9efd61ac9f75648c957c12
Author: vozerov-gridgain <[hidden email]>
Date:   2015-12-28T14:34:11Z

    Merge branch 'ignite-1.5' into ignite-1.5.1-2

commit cca90c77f56db5d96f99610ca8dc48f6066ac1b3
Author: Anton Vinogradov <[hidden email]>
Date:   2015-12-30T06:57:01Z

    Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

commit 2e64d0d7cc51552fffc231cbc850cd615076fb85
Author: vozerov-gridgain <[hidden email]>
Date:   2015-12-29T06:31:58Z

    IGNITE-2258: IGFS: now default path modes could be optionally disabled using FileSystemConfiguration.isInitializeDefaultPathModes() property.

commit 4cd3b3dc2f1fa0f1a9cceb6bf544dd8fb505d7f5
Author: vozerov-gridgain <[hidden email]>
Date:   2015-12-29T09:52:00Z

    IGNITE-2258: Fixed type on getter/setter.

commit 5d58fcbf40fdb9114e4cbb32b72dd9bce7fa38ca
Author: iveselovskiy <[hidden email]>
Date:   2016-01-04T06:47:28Z

    IGNITE-2308: Fixed HadoopClassLoader dependency resolution. This closes #391.

commit 83a19179cee2bb15adc36c2265dd0a3c794b60bb
Author: vozerov-gridgain <[hidden email]>
Date:   2016-01-04T08:14:58Z

    IGNITE-2218: Fixed a problem with native Hadoop libraries load. This closes #378.

commit 1d7fb5702fa33cf395e797161f3a86a9600921a7
Author: vozerov-gridgain <[hidden email]>
Date:   2016-01-05T06:59:31Z

    IGNITE-2206: Hadoop file system creation is now abstracted out using factory interface.

commit a12ec7d08573d5396654a5ba05bb7d873e4c2677
Author: Ignite Teamcity <[hidden email]>
Date:   2016-01-06T10:50:48Z

    1.5.2

commit 090a5de6a930c10a3a57a6e28c486fe5c87e028d
Author: vozerov-gridgain <[hidden email]>
Date:   2015-12-29T12:50:39Z

    Minor fix.

commit c786820dda7f7cd1849c5593ac24ca9072945887
Author: vozerov-gridgain <[hidden email]>
Date:   2016-01-07T13:48:14Z

    IgniteHadoopIgfsSecondaryFileSystem.usrName field is renamed to "userName" to preserve backward compatibility.

commit 6ab4ce246316442fa4295f9941c372fea70c24ef
Author: vozerov-gridgain <[hidden email]>
Date:   2016-01-08T06:23:55Z

    IGNITE-2342: Set correct classlader before calling FileSystem.get().

commit 077ab1b3a77fdb1c2c2fd6360fc5b60fda6c50c3
Author: vozerov-gridgain <[hidden email]>
Date:   2016-01-08T07:17:45Z

    IGNITE-2341: Improved warning message when BinaryMarshaller cannot be used. Also it is not shown when "org.apache.ignite" classes is in described situation.

commit 86c4816edfd0e983014f136ffc92cde28ec56cca
Author: vozerov-gridgain <[hidden email]>
Date:   2016-01-08T07:26:03Z

    IGNITE-2340: Improved error thrown when PROXY mode exists, but secondary file system is not IgniteHadoopIgfsSecondaryFileSystem.

commit fc48a8429a84ef6c87ed3225a218d7d3ae617e14
Author: vozerov-gridgain <[hidden email]>
Date:   2016-01-08T07:48:42Z

    Merge branch 'ignite-1.5.2' into ignite-1.5.3

commit 86740cefe212ed0f506d81056dd8e76de9a31e4f
Author: Ignite Teamcity <[hidden email]>
Date:   2016-01-08T09:32:11Z

    1.5.3-SNAPSHOT

commit 92229d2a6c6ef86772a62cb52b3aa07a55c99d89
Author: sboikov <[hidden email]>
Date:   2016-01-13T05:56:34Z

    ignite-2359 Added locking for files used by MarshallerContextImpl. (cherry picked from commit 1d8c4e2)

commit 2e4ce585d5f54502c6511d3425b1cd5fbf0a7f4f
Author: Ignite Teamcity <[hidden email]>
Date:   2016-01-13T10:37:33Z

    1.5.4-SNAPSHOT

commit 6e5f9f0c7d4c86773b1f0cd5c5a673acb58c86c2
Author: Denis Magda <[hidden email]>
Date:   2016-01-13T11:42:27Z

    Changed year to 2016 in Copyrights

commit 02dbcfd8ed2701a4f415c8871d0b8fd08bfa0583
Author: Alexey Goncharuk <[hidden email]>
Date:   2016-01-13T13:47:32Z

    IGNITE-2365 - Notify policy if swap or offheap is enabled and rebalanced entry was not preloaded.
    IGNITE-2099 - Fixing custom collections.
    This closes #396

commit 86c2ba2a601e82b824cf17422683e5398a4d8c7d
Author: sboikov <[hidden email]>
Date:   2016-01-13T15:40:08Z

    ignite-2350 Pass update notifier flag in discovery data (all cluster nodes will have the same notifier status as first cluster node)
    (cherry picked from commit 7175a42)

commit e1a494df400fc37ca04e8d88d1cf20bca02607b4
Author: sboikov <[hidden email]>
Date:   2016-01-14T11:16:33Z

    Renamed fields to change fields write order (to preserve backward compatibility).
    (cherry picked from commit 2a4adf5)

commit 09f978234b6062afa1e1658d5a6439365a856aca
Author: sboikov <[hidden email]>
Date:   2016-01-14T11:42:44Z

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

commit 30043e7892d0b52dc851ce5ec79c7eb3b7cc44fb
Author: Denis Magda <[hidden email]>
Date:   2016-01-14T13:02:50Z

    Added release notes

commit cc3db35925698f1670a8bf1c6a1830c0c9b51290
Author: vershov <[hidden email]>
Date:   2016-01-14T14:21:56Z

    IGNITE-2032 Unwind undeploys in preloader - Fixes #369.
   
    Signed-off-by: Alexey Goncharuk <[hidden email]>

----


---
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 agura closed the pull request at:

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


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