Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AC1F01877F for ; Tue, 22 Dec 2015 16:28:43 +0000 (UTC) Received: (qmail 23462 invoked by uid 500); 22 Dec 2015 16:28:09 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 23295 invoked by uid 500); 22 Dec 2015 16:28:09 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 22876 invoked by uid 99); 22 Dec 2015 16:28:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Dec 2015 16:28:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CA909E0AF3; Tue, 22 Dec 2015 16:28:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: av@apache.org To: commits@ignite.apache.org Date: Tue, 22 Dec 2015 16:28:21 -0000 Message-Id: In-Reply-To: <3aae05b020d741ff86985295e760603d@git.apache.org> References: <3aae05b020d741ff86985295e760603d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/15] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2 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 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/55645c1b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/55645c1b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/55645c1b Branch: refs/heads/ignite-1.5.1-2 Commit: 55645c1bcca21d03f2789f97bbdc3658216ee529 Parents: c0cfc6a b6dab09 Author: Anton Vinogradov Authored: Tue Dec 22 19:26:52 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 22 19:26:52 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric-lgpl.xml | 7 + assembly/dependencies-fabric.xml | 7 + examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../ignite/internal/IgniteVersionUtils.java | 5 +- .../internal/binary/GridBinaryMarshaller.java | 10 ++ .../binary/CacheObjectBinaryProcessorImpl.java | 3 + .../ignite/lang/IgniteProductVersion.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../product/GridProductVersionSelfTest.java | 22 ++- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++++++++++++++++++ modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../config/benchmark-multicast.properties | 6 +- modules/yardstick/pom.xml | 2 +- .../cache/IgnitePutTxImplicitBenchmark.java | 52 +++++++ .../cache/IgnitePutTxOffHeapBenchmark.java | 2 +- .../IgnitePutTxOffHeapValuesBenchmark.java | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 4 +- 76 files changed, 336 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/55645c1b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs index c29d05e,859620c..d7c2416 --- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/55645c1b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs index 0e5dd87,1fc5582..cebf14f --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/55645c1b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs index 311fa79,bd3237c..b994c4b --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/55645c1b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs index e7d8ccd,f7e2f86..43f011e --- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/55645c1b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs index cd6f9d4,ab59db5..b2c2a17 --- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/55645c1b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs index 5e1b163,e9c35d3..66b0b53 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/55645c1b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs index 50c1195,5d251b7..8d31149 --- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership.