Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: spinnaker/deck
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: plumpy/deck
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 2, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    binghe Chun Tian
    Copy the full SHA
    27c09ec View commit details
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ module(GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_BASICSETTINGS_BASICSETTINGS_COMPONENT
},
templateUrl: require('./basicSettings.component.html'),
controller: function controller() {
this.modes = ['ON', 'OFF', 'ONLY_UP'];
this.modes = ['ON', 'OFF', 'ONLY_SCALE_OUT'];
},
},
);
4 changes: 2 additions & 2 deletions app/scripts/modules/google/src/help/gce.help.ts
Original file line number Diff line number Diff line change
@@ -155,7 +155,7 @@ const helpContents: { [key: string]: string } = {
'gce.serverGroup.autoscaling.cooldown':
'How long to wait before collecting information from a new instance. This should be at least the time it takes to initialize the instance. To find the minimum, create an instance from the same image and note how long it takes to start.',
'gce.serverGroup.autoscaling.mode':
'Mode of operation of the autoscaling policy. This guides the autoscaler by defining the types of scaling operations it can perform. Options are ON, ONLY_UP, and OFF.',
'Mode of operation of the autoscaling policy. This guides the autoscaler by defining the types of scaling operations it can perform. Options are ON, ONLY_SCALE_OUT, and OFF.',
'gce.serverGroup.autoHealing':
'VMs in the group are recreated as needed. You can use a health check to recreate a VM if the health check finds the VM unresponsive. If you do not select a health check, VMs are recreated only when stopped.',
'gce.serverGroup.initialDelaySec':
@@ -212,4 +212,4 @@ const helpContents: { [key: string]: string } = {
'<p>Google Cloud Platform (GCP) TCP Proxy Load Balancing allows you to use a single IP address for all users around the world. GCP TCP proxy load balancing automatically routes traffic to the instances that are closest to the user.</p>',
};

Object.keys(helpContents).forEach(key => HelpContentsRegistry.register(key, helpContents[key]));
Object.keys(helpContents).forEach((key) => HelpContentsRegistry.register(key, helpContents[key]));