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
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:
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
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:
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:
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:
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: