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/2ec1092f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ec1092f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ec1092f Branch: refs/heads/ignite-843-rc2 Commit: 2ec1092f619ec8562ccb4dbb4422d8855cb7fb79 Parents: f9458d2 a8ac743 Author: Andrey <[email protected]> Authored: Fri Jan 15 14:27:49 2016 +0700 Committer: Andrey <[email protected]> Committed: Fri Jan 15 14:27:49 2016 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 6 - .../main/js/controllers/metadata-controller.js | 114 ++++++++++--------- .../src/main/js/controllers/models/caches.json | 14 --- .../main/js/controllers/models/metadata.json | 32 ++++++ modules/control-center-web/src/main/js/db.js | 2 +- .../js/helpers/generator/generator-common.js | 5 + .../main/js/helpers/generator/generator-java.js | 74 +++++++----- .../main/js/helpers/generator/generator-xml.js | 56 +++++---- .../main/js/views/configuration/metadata.jade | 2 +- .../src/main/js/views/includes/controls.jade | 2 - 10 files changed, 184 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
