Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2DCFA200AF5 for ; Thu, 2 Jun 2016 18:25:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2C58B160A52; Thu, 2 Jun 2016 16:25:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 50424160A3E for ; Thu, 2 Jun 2016 18:25:31 +0200 (CEST) Received: (qmail 74242 invoked by uid 500); 2 Jun 2016 16:25:30 -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 74226 invoked by uid 99); 2 Jun 2016 16:25:30 -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; Thu, 02 Jun 2016 16:25:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 635E6E0105; Thu, 2 Jun 2016 16:25:30 +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: Thu, 02 Jun 2016 16:25:31 -0000 Message-Id: <58753a7088f24a9898708d51dbb4a83a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge remote-tracking branch 'remotes/origin/gridgain-7.6.1' archived-at: Thu, 02 Jun 2016 16:25:32 -0000 Merge remote-tracking branch 'remotes/origin/gridgain-7.6.1' # Conflicts: # benchmarks/yardstick/src/main/dotnet/gridgain-benchmarks/Properties/AssemblyInfo.cs # modules/platforms/cpp/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/yardstick/dotnet/Properties/AssemblyInfo.cs Merge remote-tracking branch 'remotes/upstream/gridgain-7.6.1' # Conflicts: # modules/platforms/cpp/configure.ac # modules/platforms/cpp/examples/configure.ac # modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/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.Linq/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 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/265d1248 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/265d1248 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/265d1248 Branch: refs/heads/master Commit: 265d1248df8bf04024a6cc68f3d344313d83e9f6 Parents: f633eea e0cf0fc Author: Anton Vinogradov Authored: Thu Jun 2 19:25:09 2016 +0300 Committer: Anton Vinogradov Committed: Thu Jun 2 19:25:09 2016 +0300 ---------------------------------------------------------------------- modules/platforms/cpp/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 6 +++--- .../Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs | 6 +++--- .../Properties/AssemblyInfo.cs | 6 +++--- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 6 +++--- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 6 +++--- .../dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs | 6 +++--- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 6 +++--- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 6 +++--- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 6 +++--- modules/web-agent/pom.xml | 2 +- modules/web-console/pom.xml | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/265d1248/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs index f08deb4,b7eb064..1366829 --- 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/265d1248/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs index eaffcb5,41b141e..fa30ff6 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/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/265d1248/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 0d4c88a,d1fcc88..d04fd69 --- 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/265d1248/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs index 535763b,f17315a..f1953e3 --- 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/265d1248/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs index fc9dfcc,afc2aef..955f205 --- 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/265d1248/modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs index b975dcf,e182f65..8a4b342 --- a/modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Linq/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/265d1248/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs index 4073613,57c4b95..48310a7 --- 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/265d1248/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs index 8a545bc,92bfd0d..2423f2d --- 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/265d1248/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs index 3ebf511,0169fb9..4cb86b5 --- 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.