Skip to content

Commit c8750f8

Browse files
committed
Merge branch 'master' into feature/dynamic-cluster
2 parents 01c1b84 + cd13e9f commit c8750f8

File tree

3 files changed

+2
-348
lines changed

3 files changed

+2
-348
lines changed

operator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<dependency>
225225
<groupId>io.kubernetes</groupId>
226226
<artifactId>client-java</artifactId>
227-
<version>1.0.0-beta3</version>
227+
<version>1.0.0-beta4</version>
228228
</dependency>
229229
<dependency>
230230
<groupId>javax</groupId>

operator/src/main/java/io/kubernetes/client/Exec.java

Lines changed: 0 additions & 346 deletions
This file was deleted.

operator/src/main/java/oracle/kubernetes/operator/TuningParametersImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private void update() {
4848

4949
MainTuning main = new MainTuning(
5050
(int) readTuningParameter("statusUpdateTimeoutSeconds", 10),
51-
(int) readTuningParameter("statueUpdateUnchangedCountToDelayStatusRecheck", 10),
51+
(int) readTuningParameter("statusUpdateUnchangedCountToDelayStatusRecheck", 10),
5252
readTuningParameter("statusUpdateInitialShortDelay", 3),
5353
readTuningParameter("statusUpdateEventualLongDelay", 30));
5454

0 commit comments

Comments
 (0)