Merge pull request #3706 from simplesurance/revert_min_cpu_limit_change

revert change to increase min. CPU resource value from 20 to 100
hashicorp · Jan 3, 2018 · e0f84fc · e0f84fc · DarkoDoko · Jan 26, 2018
2 parents d29f877 + 957712c
commit e0f84fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/resources.go b/api/resources.go
@@ -49,7 +49,7 @@ func DefaultResources() *Resources {
 // IN nomad/structs/structs.go and should be kept in sync.
 func MinResources() *Resources {
 	return &Resources{
-		CPU:      helper.IntToPtr(100),
+		CPU:      helper.IntToPtr(20),
 		MemoryMB: helper.IntToPtr(10),
 		IOPS:     helper.IntToPtr(0),
 	}

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -1253,7 +1253,7 @@ func DefaultResources() *Resources {
 // api/resources.go and should be kept in sync.
 func MinResources() *Resources {
 	return &Resources{
-		CPU:      100,
+		CPU:      20,
 		MemoryMB: 10,
 		IOPS:     0,
 	}