Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/962ad5a5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/962ad5a5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/962ad5a5 Branch: refs/heads/ignite-843-rc1 Commit: 962ad5a5cb6d40fb7fb211030853f7f202ec77cf Parents: d2efc00 ed0399e Author: Alexey Kuznetsov <[email protected]> Authored: Thu Oct 15 11:15:31 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Oct 15 11:15:31 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 42 ++++++++++++++++- .../src/main/js/controllers/sql-controller.js | 47 ++++++++++---------- .../js/views/configuration/metadata-load.jade | 4 +- .../src/main/js/views/sql/sql.jade | 2 +- 4 files changed, 67 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
