You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/04 10:43:54 UTC

[04/10] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

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/7eba2e2e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7eba2e2e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7eba2e2e

Branch: refs/heads/ignite-843-rc3
Commit: 7eba2e2e28b94d6d5a2714bb188ffe8fbfcf9957
Parents: b88f7ac a94f85a
Author: Andrey <an...@gridgain.com>
Authored: Thu Feb 4 11:33:27 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 4 11:33:27 2016 +0700

----------------------------------------------------------------------
 .../configuration/clusters/communication.jade   |  4 ++--
 .../configuration/clusters/deployment.jade      |  2 +-
 .../states/configuration/clusters/metrics.jade  |  2 +-
 .../states/configuration/clusters/swap.jade     |  2 +-
 .../main/js/controllers/clusters-controller.js  |  6 ++++++
 .../main/js/helpers/generator/generator-java.js | 20 ++++++++++----------
 .../main/js/helpers/generator/generator-xml.js  | 20 ++++++++++----------
 7 files changed, 31 insertions(+), 25 deletions(-)
----------------------------------------------------------------------