[25/50] incubator-ignite git commit: Merge branch 'sprint-2' into sprint-3

2015-03-30 Thread sboikov
Merge branch 'sprint-2' into sprint-3 Conflicts: modules/core/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/3d19a1de Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3

[25/50] incubator-ignite git commit: Merge branch 'sprint-2' into sprint-3

2015-03-27 Thread yzhdanov
Merge branch 'sprint-2' into sprint-3 Conflicts: modules/core/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/3d19a1de Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3