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/d8f4a980 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8f4a980 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8f4a980 Branch: refs/heads/ignite-45 Commit: d8f4a980d48352768b018f261a49753c79928b05 Parents: 9b54ec0 57db524 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Mar 23 12:47:04 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Mar 23 12:47:04 2015 -0700 ---------------------------------------------------------------------- assembly/dependencies-optional-fabric.xml | 1 + assembly/dependencies-optional-hadoop.xml | 1 + assembly/release-fabric.xml | 1 + .../org/apache/ignite/schema/CacheConfig.java | 14 ++--- .../java/org/apache/ignite/schema/Demo.java | 54 ++++++++++++-------- .../ignite/schema/generator/CodeGenerator.java | 53 +++++++++++++------ .../ignite/schema/ui/SchemaImportApp.java | 42 +++++++++------ 7 files changed, 104 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
