Merge branch 'web-console-2.1.1' into 'ignite-2.1.2'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bebe80e3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bebe80e3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bebe80e3 Branch: refs/heads/ignite-2.1.2-exchange Commit: bebe80e3f5ce2a3a078800c05c3e2eb8d8cde51b Parents: 92f66b2 c1e2bc4 Author: Andrey Novikov <[email protected]> Authored: Fri Jun 23 16:07:17 2017 +0700 Committer: Andrey Novikov <[email protected]> Committed: Fri Jun 23 16:07:17 2017 +0700 ---------------------------------------------------------------------- modules/web-console/backend/.gitignore | 1 + modules/web-console/backend/app/mongo.js | 2 +- modules/web-console/frontend/.gitignore | 1 + .../app/modules/configuration/generator/Beans.js | 8 ++++++++ .../configuration/generator/ConfigurationGenerator.js | 12 +++++++----- .../configuration/generator/JavaTransformer.service.js | 4 ++-- .../modules/states/configuration/clusters/memory.pug | 7 ++++--- .../states/configuration/clusters/persistence.pug | 2 +- 8 files changed, 25 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
