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/9f1f6601
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f1f6601
Diff:
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2
Conflicts:
examples/pom.xml
examples/schema-import/pom.xml
modules/aop/pom.xml
modules/apache-license-gen/pom.xml
modules/aws/pom.xml
modules/camel/pom.xml
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/9f1f6601
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f1f6601
Diff:
http://git-wip-us.apache.org/repos/asf/ignite/blob/c88ab6ff/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.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/ba2ffb07
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba2ffb07
Diff: