[GitHub] ignite pull request: 7.5.12

2016-04-12 Thread avinogradovgg 
GitHub user avinogradovgg opened a pull request:

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

7.5.12



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

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

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

https://github.com/apache/ignite/pull/635.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 #635


commit c3fe967874c4c3606f6b047a852caeef1ccb55aa
Author: Ignite Teamcity 
Date:   2015-12-17T10:04:46Z

1.5.1-final-SNAPSHOT

commit 11bee91787dd3d6f2a57739e26622e55428f3b1c
Author: Anton Vinogradov 
Date:   2015-12-17T11:27:16Z

Ignite-2087
(cherry picked from commit bd1f506)

commit 206e5a53c3cfa6285d911efe093ede03a3a67892
Author: Alexey Goncharuk 
Date:   2015-12-17T14:03:59Z

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 
into ignite-1.5.1-2

commit 0482316e413661a3fb1bd15bab15c2a1e48cc294
Author: Anton Vinogradov 
Date:   2015-12-18T12:40:57Z

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

commit 9f1f6601e3b77010c57186fb6e041a58a0fce550
Author: Anton Vinogradov 
Date:   2015-12-21T08:51:36Z

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

commit ad5bcec935b20421effb4ad5886e39549921fe99
Author: Anton Vinogradov 
Date:   2015-12-21T13:40:55Z

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

Conflicts:
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

commit 524d72e2bcb4a813cad25ab6d96b2ddc7ff00c83
Author: Ignite Teamcity 
Date:   2015-12-21T14:04:46Z

1.5.1-final-SNAPSHOT

commit b534c42711d289408bacc9824300d6ec5fcc0fe7
Author: Alexey Goncharuk 
Date:   2015-12-21T15:56:55Z

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 
into ignite-1.5.1-2

commit c0cfc6a784ab94430b730d200d37788b70dc930b
Author: Anton Vinogradov 
Date:   2015-12-22T08:54:01Z

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

commit 55645c1bcca21d03f2789f97bbdc3658216ee529
Author: Anton Vinogradov 
Date:   2015-12-22T16:26:52Z

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

[GitHub] ignite pull request: 7.5.12

2016-04-12 Thread avinogradovgg 
Github user avinogradovgg closed the pull request at:

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


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---