[45/50] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-191

2015-02-12 Thread sergi
Merge branch 'sprint-1' into ignite-191 Conflicts: modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f403ee

[45/50] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-191

2015-02-12 Thread sboikov
Merge branch 'sprint-1' into ignite-191 Conflicts: modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f403ee