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/03/01 15:08:57 UTC
[2/3] ignite git commit: Merge branch 'ignite-843-rc2' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
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/9124a089
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9124a089
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9124a089
Branch: refs/heads/ignite-2612
Commit: 9124a0896b4c61b1a5ed3633bd3e43e479db6fa5
Parents: 45fa19a 06af6d2
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Mar 1 17:34:20 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Mar 1 17:34:20 2016 +0700
----------------------------------------------------------------------
.../clusters/general/discovery/zookeeper.jade | 5 ++-
.../bounded-exponential-backoff.jade | 5 +--
.../discovery/zookeeper/retrypolicy/custom.jade | 2 +-
.../retrypolicy/exponential-backoff.jade | 4 +--
.../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/helpers/generator/generator-java.js | 34 ++++++++++----------
.../main/js/helpers/generator/generator-xml.js | 30 ++++++++---------
10 files changed, 39 insertions(+), 47 deletions(-)
----------------------------------------------------------------------