merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb8fd071
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb8fd071
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb8fd071
Branch:
Merge remote-tracking branch 'remotes/origin/master' into ignite-zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1538ada6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1538ada6
Diff:
Merge remote-tracking branch 'remotes/origin/master' into ignite-5578-locJoin
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e7064d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e7064d3
Diff:
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 'remotes/origin/master' into ignite-5009
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49b95b42
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49b95b42
Diff:
Merge-related fixes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/21dcef20
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/21dcef20
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/21dcef20
Branch:
Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into
ignite-3477
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e0d876
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e0d876
Diff:
Merge branch ignite-1.7.2 to master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7ae5c8d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7ae5c8d
Diff:
http://git-wip-us.apache.org/repos/asf/ignite/blob/b7450ef4/modules/platforms/cpp/jni/src/exports.cpp
--
diff --cc modules/platforms/cpp/jni/src/exports.cpp
index 461d146,000..0e84a17
mode 100644,00..100644
---
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/322e61cd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/322e61cd
Diff:
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/3fad0ab6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3fad0ab6
Diff:
Merge branch 'ignite-1.5' into ignite-2206
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40d2291a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40d2291a
Diff:
12 matches
Mail list logo