ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [4/5] ignite git commit: Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Date Fri, 26 Feb 2016 10:16:33 GMT
Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612


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

Branch: refs/heads/ignite-2612
Commit: f92d9a821fe38f43e4bfe07d58fcd38411d8f7f2
Parents: 5c0aa35 aaf139b
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Fri Feb 26 15:00:59 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Feb 26 15:00:59 2016 +0700

----------------------------------------------------------------------
 .../js/app/modules/form/field/input/number.jade |  2 +-
 .../states/configuration/clusters/general.jade  |  8 +++++++
 .../clusters/general/discovery/zookeeper.jade   | 21 +++++++++++------
 .../bounded-exponential-backoff.jade            |  6 +++--
 .../retrypolicy/exponential-backoff.jade        |  6 +++--
 .../zookeeper/retrypolicy/forever.jade          |  1 +
 .../zookeeper/retrypolicy/n-times.jade          |  2 ++
 .../zookeeper/retrypolicy/one-time.jade         |  1 +
 .../zookeeper/retrypolicy/until-elapsed.jade    |  2 ++
 .../main/js/controllers/clusters-controller.js  |  6 ++---
 .../main/js/helpers/generator/generator-java.js |  9 ++++----
 .../main/js/helpers/generator/generator-xml.js  | 24 ++++----------------
 .../src/main/js/public/stylesheets/style.scss   |  2 +-
 .../src/main/js/views/settings/admin.jade       |  2 +-
 14 files changed, 51 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f92d9a82/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------


Mime
View raw message