ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [31/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/web-console-staging' into ignite-gg-webpack-migration
Date Mon, 20 Jun 2016 02:58:54 GMT
Merge remote-tracking branch 'origin/web-console-staging' into ignite-gg-webpack-migration

Conflicts:
	modules/web-console/src/main/js/controllers/caches-controller.js
	modules/web-console/src/main/js/controllers/clusters-controller.js
	modules/web-console/src/main/js/controllers/domains-controller.js
	modules/web-console/src/main/js/controllers/igfs-controller.js


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40f6abc4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40f6abc4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40f6abc4

Branch: refs/heads/ignite-3262
Commit: 40f6abc40b7eb583383b5ae436d4591c790b4daf
Parents: fb8f08b 79270b1
Author: Maxim Afanasiev <mafkus@gmail.com>
Authored: Thu Jun 9 22:31:34 2016 +0700
Committer: Maxim Afanasiev <mafkus@gmail.com>
Committed: Thu Jun 9 22:31:34 2016 +0700

----------------------------------------------------------------------
 .../http/jetty/GridJettyJsonConfig.java         |  31 +++++
 .../http/jetty/GridJettyRestHandler.java        |   6 +-
 modules/schema-import/README.txt                |  12 +-
 modules/web-agent/README.txt                    |   4 +-
 .../ignite/console/demo/AgentClusterDemo.java   |  86 ++++--------
 modules/web-console/README.txt                  |   4 +-
 .../src/main/js/app/helpers/jade/mixins.jade    |  13 +-
 .../states/configuration/caches/store.jade      |  16 +--
 .../states/configuration/clusters/binary.jade   |  12 +-
 .../clusters/general/discovery/zookeeper.jade   |  17 ++-
 .../bounded-exponential-backoff.jade            |   6 +-
 .../discovery/zookeeper/retrypolicy/custom.jade |   6 +-
 .../retrypolicy/exponential-backoff.jade        |   6 +-
 .../zookeeper/retrypolicy/forever.jade          |   2 +-
 .../zookeeper/retrypolicy/n-times.jade          |   2 +-
 .../zookeeper/retrypolicy/one-time.jade         |   2 +-
 .../zookeeper/retrypolicy/until-elapsed.jade    |   4 +-
 .../states/configuration/clusters/igfs.jade     |   2 +-
 .../states/configuration/domains/store.jade     |   2 +-
 .../src/main/js/app/services/cleanup.service.js |   4 +-
 .../main/js/controllers/caches-controller.js    | 122 +++++------------
 .../main/js/controllers/clusters-controller.js  | 137 +++++++++----------
 .../src/main/js/controllers/common-module.js    |  37 ++++-
 .../main/js/controllers/domains-controller.js   |  70 +++-------
 .../src/main/js/controllers/igfs-controller.js  |  33 +----
 .../src/main/js/generator/generator-common.js   |   9 +-
 .../src/main/js/generator/generator-java.js     |  61 +++++----
 .../src/main/js/public/stylesheets/style.scss   |   9 ++
 .../js/views/configuration/domains-import.jade  |   4 +-
 29 files changed, 329 insertions(+), 390 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/40f6abc4/modules/web-console/src/main/js/controllers/common-module.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/40f6abc4/modules/web-console/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------


Mime
View raw message