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/975dec85 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/975dec85 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/975dec85 Branch: refs/heads/ignite-843-rc2 Commit: 975dec8587d6ed27b040c01f6c43d40bbd30ef19 Parents: 54a2474 6945cfc Author: Andrey <[email protected]> Authored: Fri Jan 15 16:56:11 2016 +0700 Committer: Andrey <[email protected]> Committed: Fri Jan 15 16:56:11 2016 +0700 ---------------------------------------------------------------------- .../main/js/controllers/metadata-controller.js | 66 +++++++++----------- .../main/js/controllers/models/metadata.json | 29 +++------ modules/control-center-web/src/main/js/db.js | 2 +- .../js/helpers/generator/generator-common.js | 4 +- .../main/js/helpers/generator/generator-java.js | 41 ++++++------ .../main/js/helpers/generator/generator-xml.js | 27 ++++---- 6 files changed, 75 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
