Merge branch 'sprint-1' into ignite-175
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e4365c33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4365c33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4365c33 Branch: refs/heads/ignite-188 Commit: e4365c33f14794cc695a5be83a564d06d6ee27d5 Parents: 7c0bb79 aaef58c Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 6 14:32:04 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 6 14:32:04 2015 +0300 ---------------------------------------------------------------------- .../ignite/schema/model/PojoDescriptor.java | 8 +- .../org/apache/ignite/schema/ui/Controls.java | 4 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 137 ++++++++++++------- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 10 +- 4 files changed, 103 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
