merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc1ac15c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc1ac15c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc1ac15c
Branch:
Merge remote-tracking branch 'remotes/origin/master' into ignite-8297
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce69b61c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce69b61c
Diff:
Merge remote-tracking branch 'remotes/origin/master' into ignite-zk
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit:
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fce2e31f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fce2e31f
Diff:
Merge remote-tracking branch 'remotes/origin/ignite-2.1' into ignite-gg-12389
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
#
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
#
Merge remote-tracking branch 'upstream/ignite-3477-master' into
ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5839f481
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5839f481
Diff:
Merge branch ignite-1.7.9 into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99bb87ae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99bb87ae
Diff:
Merge ignite-1.7.9 into master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84880a81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84880a81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84880a81
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/700398fc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/700398fc
Diff:
Merge remote-tracking branch 'remotes/community/ignite-1.7.2' into
ignite-comm-opts2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e72f519
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e72f519
Diff:
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:
Merge remote-tracking branch 'remotes/upstream/gridgain-7.6.1'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca546b3d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca546b3d
Diff:
Merge remote-tracking branch 'remotes/community/gridgain-7.6.1'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/919e28a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/919e28a7
Diff:
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:
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:
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:
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:
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:
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0482316e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0482316e
Diff:
Merge branches 'ignite-1.5' and 'ignite-843-rc2' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5b7b8403
Tree:
Merge branch 'ignite-1.5'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e7911a2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e7911a2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e7911a2
Branch:
Merge branches 'ignite-1.4-slow-server-debug' and 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4-slow-server-debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/744aa283
Tree:
23 matches
Mail list logo