Merge branches 'ignite-377' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13e2d1f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13e2d1f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13e2d1f6 Branch: refs/heads/ignite-237 Commit: 13e2d1f678cea51f18b7c5ae2ec48157eccbf4c3 Parents: c9f46c1 061ea8a Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Mar 2 15:55:59 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Mar 2 15:55:59 2015 +0700 ---------------------------------------------------------------------- .../core/src/test/config/store/jdbc/Ignite.xml | 63 ++++++--- .../ignite/schema/generator/XmlGenerator.java | 8 +- .../apache/ignite/schema/model/PojoField.java | 11 +- .../apache/ignite/schema/load/model/Ignite.xml | 133 ++++++++++++++----- .../yardstick/config/ignite-store-config.xml | 15 ++- 5 files changed, 168 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
