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/cb42765e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb42765e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb42765e Branch: refs/heads/ignite-843-rc1 Commit: cb42765e429958d7aee3d14740d2f841d252e29e Parents: 7ef27e5 b3010bb Author: Alexey Kuznetsov <[email protected]> Authored: Mon Oct 26 10:13:28 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Oct 26 10:13:28 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 21 ++++---- .../src/main/js/public/stylesheets/style.scss | 2 +- .../src/main/js/views/sql/sql.jade | 50 ++++++++++++-------- 3 files changed, 40 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
