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/91ce6b57 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91ce6b57 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91ce6b57 Branch: refs/heads/ignite-843-rc1 Commit: 91ce6b57a842310fa2849e9ec2efb938890d99d9 Parents: 67c6d4a cf9eddc Author: Alexey Kuznetsov <[email protected]> Authored: Wed Nov 11 17:58:11 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Nov 11 17:58:11 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 2 +- .../main/js/controllers/metadata-controller.js | 4 +-- .../main/js/controllers/summary-controller.js | 28 +++++++++++--------- modules/control-center-web/src/main/js/db.js | 2 +- .../js/helpers/generator/generator-common.js | 2 +- .../main/js/helpers/generator/generator-java.js | 4 +-- .../main/js/helpers/generator/generator-xml.js | 2 +- .../src/main/js/views/includes/controls.jade | 10 +++---- 8 files changed, 28 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
