You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/01 09:27:12 UTC
[4/4] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1.5.1
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1
Conflicts:
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
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8c6acc1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8c6acc1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8c6acc1
Branch: refs/heads/ignite-1.5.1
Commit: f8c6acc1de966e31deb1dcf73754ef9ff9bc06f0
Parents: 4f1d55c 9830300
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Dec 1 11:25:37 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Dec 1 11:25:37 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------