[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-961

2015-12-28 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-961 Conflicts: examples/pom.xml modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

2015-12-24 Thread av
Merge remote-tracking branch 'remotes/origin/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/36261adf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/36261adf Diff:

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1

2015-12-08 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1 Conflicts: benchmarks/cache-comparison/pom.xml benchmarks/filesystem/hadoop1/pom.xml benchmarks/filesystem/hadoop2/pom.xml benchmarks/mongo/pom.xml benchmarks/risk-analytics/pom.xml

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

2015-12-07 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-1.5' Conflicts: modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit:

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

2015-11-24 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-1.5' Conflicts: modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c88ab6ff Tree:

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-opt

2015-11-22 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-opt Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1be4732b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1be4732b Diff:

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758-debug

2015-11-10 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758-debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7723fe1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7723fe1 Diff: