Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cf083b9f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf083b9f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf083b9f Branch: refs/heads/ignite-45-gridcache Commit: cf083b9f85d018e1fae680d13627b187ba7574c9 Parents: bf5b8f4 46d054d Author: sboikov <sboi...@gridgain.com> Authored: Mon Mar 23 18:04:48 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Mar 23 18:04:48 2015 +0300 ---------------------------------------------------------------------- .../schema-import/bin/schema-import.properties | 4 +-- .../java/org/apache/ignite/schema/Demo.java | 16 ++++++--- .../ignite/schema/ui/SchemaImportApp.java | 34 +++++++++++++------- 3 files changed, 37 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
