Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8b4175dd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b4175dd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b4175dd Branch: refs/heads/ignite-843-rc2 Commit: 8b4175ddafc304b0c14cd122337d28a2be73c516 Parents: 39b68d0 0dfdaeb Author: Alexey Kuznetsov <[email protected]> Authored: Mon Dec 21 18:25:59 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Dec 21 18:25:59 2015 +0700 ---------------------------------------------------------------------- .../app/modules/states/configuration/index.js | 20 +- .../src/main/js/app/modules/states/sql/index.js | 5 +- .../src/main/js/controllers/sql-controller.js | 6 +- .../src/main/js/public/stylesheets/style.scss | 7 +- .../src/main/js/views/sql/sql.jade | 251 ++++++++++--------- 5 files changed, 154 insertions(+), 135 deletions(-) ----------------------------------------------------------------------
