Skip to content

Commit a601fcd

Browse files
committed
Merge branch 'master' into conat-supercluster
2 parents 026d555 + 835c04c commit a601fcd

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

src/packages/frontend/chat/video/video-chat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class VideoChat {
2525
}
2626

2727
close = () => {
28-
this.closeVideoChatWindow();
28+
// this.closeVideoChatWindow();
2929
delete this.intervalId;
3030
};
3131

src/packages/frontend/compute/google-cloud-config.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,9 @@ function Provisioning({ priceData, setConfig, configuration, disabled }) {
794794
</Radio.Button>
795795
<Radio.Button value="standard">
796796
Standard{" "}
797-
{prices != null ? `${currency(prices.standard)}/hour` : undefined}{" "}
797+
{prices != null
798+
? `${currency(prices.standard)}/hour`
799+
: undefined}{" "}
798800
</Radio.Button>
799801
</Radio.Group>
800802
<div style={{ color: "#666", marginTop: "5px" }}>
@@ -1212,7 +1214,10 @@ function GPU({
12121214
if (!!acceleratorType) {
12131215
setConfig({ acceleratorType: "", acceleratorCount: 0 });
12141216
} else {
1215-
setConfig(DEFAULT_GPU_CONFIG);
1217+
setConfig({
1218+
...DEFAULT_GPU_CONFIG,
1219+
spot: configuration?.spot ?? false,
1220+
});
12161221
}
12171222
}}
12181223
/>

src/packages/util/compute/cloud/clouds.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
// if a random default folder is excluded!
3232
const DEFAULT_EXCLUDE_FROM_SYNC = [] as const;
3333

34-
const GCLOUD_SPOT_DEFAULT = true;
34+
const GCLOUD_SPOT_DEFAULT = false;
3535

3636
export const GOOGLE_CLOUD_DEFAULTS = {
3737
cpu: {

0 commit comments

Comments
 (0)