[19/35] incubator-ignite git commit: Merge branch 'ignite-1.0.0-b'

2015-07-07 Thread sboikov
Merge branch 'ignite-1.0.0-b' Conflicts: examples/pom-standalone.xml 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/825e2fe4 Tree: http://git-wip-us.apache.org/repos/asf/incubato

[19/35] incubator-ignite git commit: Merge branch 'ignite-1.0.0-b'

2015-07-07 Thread sboikov
Merge branch 'ignite-1.0.0-b' Conflicts: examples/pom-standalone.xml 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/825e2fe4 Tree: http://git-wip-us.apache.org/repos/asf/incubato