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/42807ab7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42807ab7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42807ab7 Branch: refs/heads/ignite-843-rc3 Commit: 42807ab7f8709f0e4eba551fe36bc678176b21ce Parents: 31e6254 a7334db Author: Andrey <[email protected]> Authored: Mon Feb 8 16:36:18 2016 +0700 Committer: Andrey <[email protected]> Committed: Mon Feb 8 16:36:18 2016 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/.eslintrc | 2 +- .../bs-affix-update.directive.js | 34 +++++++++++++++++++ .../control-center-web/src/main/js/app/index.js | 2 ++ .../src/main/js/controllers/common-module.js | 2 +- .../src/main/js/public/images/cache.png | Bin 46915 -> 96014 bytes .../src/main/js/public/images/cluster.png | Bin 99129 -> 134591 bytes .../src/main/js/public/images/domains.png | Bin 54356 -> 84759 bytes .../src/main/js/public/images/igfs.png | Bin 48721 -> 46359 bytes .../src/main/js/public/images/query-chart.png | Bin 46482 -> 48704 bytes .../src/main/js/public/images/summary.png | Bin 83472 -> 125589 bytes .../src/main/js/public/stylesheets/style.scss | 4 +++ .../src/main/js/views/configuration/caches.jade | 1 + .../main/js/views/configuration/clusters.jade | 1 + .../main/js/views/configuration/domains.jade | 1 + .../src/main/js/views/configuration/igfs.jade | 1 + .../main/js/views/configuration/summary.jade | 1 + .../src/main/js/views/includes/controls.jade | 2 +- 17 files changed, 48 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
