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/26 14:58:54 UTC
ignite git commit: Merge branch ignite-843-rc2 into ignite-2612
Repository: ignite
Updated Branches:
refs/heads/ignite-2612 666de92f2 -> 59530acbb
Merge branch ignite-843-rc2 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/59530acb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59530acb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59530acb
Branch: refs/heads/ignite-2612
Commit: 59530acbbeb71ab5cc942928190130049699c847
Parents: 666de92
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Feb 26 20:54:36 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Feb 26 20:54:36 2016 +0700
----------------------------------------------------------------------
.../app/modules/states/configuration.state.js | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59530acb/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
index e0e4b38..a87d195 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
@@ -30,14 +30,14 @@ import clustersGeneralDiscoveryS3 from './configuration/clusters/general/discove
import clustersGeneralDiscoveryShared from './configuration/clusters/general/discovery/shared.directive';
import clustersGeneralDiscoveryVm from './configuration/clusters/general/discovery/vm.directive';
-import generalDiscoveryZookeeper from './configuration/clusters/general/discovery/zookeeper.directive';
-import generalDiscoveryZookeeperRetryExponential from './configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive';
-import generalDiscoveryZookeeperRetryBoundedExponential from './configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive';
-import generalDiscoveryZookeeperRetryUntilElapsed from './configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive';
-import generalDiscoveryZookeeperRetryNTimes from './configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive';
-import generalDiscoveryZookeeperRetryOneTime from './configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive';
-import generalDiscoveryZookeeperRetryForever from './configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive';
-import generalDiscoveryZookeeperRetryCustom from './configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive';
+import clustersGeneralDiscoveryZookeeper from './configuration/clusters/general/discovery/zookeeper.directive';
+import clustersGeneralDiscoveryZookeeperRetryExponential from './configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive';
+import clustersGeneralDiscoveryZookeeperRetryBoundedExponential from './configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive';
+import clustersGeneralDiscoveryZookeeperRetryUntilElapsed from './configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive';
+import clustersGeneralDiscoveryZookeeperRetryNTimes from './configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive';
+import clustersGeneralDiscoveryZookeeperRetryOneTime from './configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive';
+import clustersGeneralDiscoveryZookeeperRetryForever from './configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive';
+import clustersGeneralDiscoveryZookeeperRetryCustom from './configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive';
import clustersAtomic from './configuration/clusters/atomic.directive';
import clustersBinary from './configuration/clusters/binary.directive';
@@ -99,14 +99,14 @@ angular
.directive(...clustersGeneralDiscoveryS3)
.directive(...clustersGeneralDiscoveryShared)
.directive(...clustersGeneralDiscoveryVm)
-.directive(...generalDiscoveryZookeeper)
-.directive(...generalDiscoveryZookeeperRetryExponential)
-.directive(...generalDiscoveryZookeeperRetryBoundedExponential)
-.directive(...generalDiscoveryZookeeperRetryUntilElapsed)
-.directive(...generalDiscoveryZookeeperRetryNTimes)
-.directive(...generalDiscoveryZookeeperRetryOneTime)
-.directive(...generalDiscoveryZookeeperRetryForever)
-.directive(...generalDiscoveryZookeeperRetryCustom)
+.directive(...clustersGeneralDiscoveryZookeeper)
+.directive(...clustersGeneralDiscoveryZookeeperRetryExponential)
+.directive(...clustersGeneralDiscoveryZookeeperRetryBoundedExponential)
+.directive(...clustersGeneralDiscoveryZookeeperRetryUntilElapsed)
+.directive(...clustersGeneralDiscoveryZookeeperRetryNTimes)
+.directive(...clustersGeneralDiscoveryZookeeperRetryOneTime)
+.directive(...clustersGeneralDiscoveryZookeeperRetryForever)
+.directive(...clustersGeneralDiscoveryZookeeperRetryCustom)
// Caches screen
.directive(...cachesGeneral)
.directive(...cachesMemory)