Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into gg-release-test-no-mod
Conflicts: examples/pom-standalone.xml parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40da9a8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40da9a8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40da9a8c Branch: refs/heads/ignite-tc-jclient Commit: 40da9a8c61bab44d806b9dfdae1b36f9c7b47bf3 Parents: 60da391 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Mar 25 19:53:56 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Mar 25 19:53:56 2015 +0300 ---------------------------------------------------------------------- examples/schema-import/pom.xml | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40da9a8c/examples/schema-import/pom.xml ---------------------------------------------------------------------- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index 1266bf3..21c8653 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -28,7 +28,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <ignite.version>1.0.0</ignite.version> </properties> <groupId>org.apache.ignite</groupId>