Merge remote-tracking branch 'remotes/origin/master' into ignite-6467-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec5c574d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec5c574d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec5c574d Branch: refs/heads/ignite-6467-1 Commit: ec5c574d8192487dd59e6d27daa6c1e59c0262f4 Parents: b8f4374 c8b3ba4 Author: sboikov <sboi...@apache.org> Authored: Wed Aug 1 08:05:22 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Wed Aug 1 08:05:22 2018 +0300 ---------------------------------------------------------------------- modules/web-console/e2e/docker-compose.yml | 2 +- modules/web-console/frontend/app/app.js | 2 + .../templates/load-balancing.pug | 2 +- .../cluster-edit-form/templates/memory.pug | 2 +- .../cluster-edit-form/templates/swap.pug | 2 +- .../components/page-password-changed/style.scss | 2 +- .../components/queries-notebook/controller.js | 18 ++-- .../queries-notebook/template.tpl.pug | 2 +- .../app/services/ErrorParser.service.js | 89 ++++++++++++++++++++ .../frontend/app/services/Messages.service.js | 29 +------ .../frontend/public/stylesheets/style.scss | 23 ++++- .../frontend/views/sql/cache-metadata.tpl.pug | 3 +- 12 files changed, 131 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
