[13/13] ignite git commit: Merge with master

2016-09-16 Thread ptupitsyn
Merge with master Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebbc8903 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebbc8903 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebbc8903 Branch:

[13/13] ignite git commit: Merge branch 'master' into ignite-1786

2016-04-27 Thread vozerov
Merge branch 'master' into ignite-1786 # Conflicts: # modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7450ef4 Tree:

[13/13] ignite git commit: Merge branch 'master' into ignite-2004

2016-04-13 Thread ntikhonov
Merge branch 'master' into ignite-2004 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/586a2075 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/586a2075 Diff:

[13/13] ignite git commit: Merge branch 'master' into ignite-1186

2016-02-26 Thread ntikhonov
Merge branch 'master' into ignite-1186 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2537d797 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2537d797 Diff:

[13/13] ignite git commit: Merge branch 'master' into ignite-1786

2016-02-18 Thread vozerov
Merge branch 'master' into ignite-1786 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa373596 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa373596 Diff:

[13/13] ignite git commit: Merge branch 'master' into ignite-2314

2016-01-03 Thread vozerov
Merge branch 'master' into ignite-2314 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/51cdfd44 Tree: