-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
changelog: add UI component to #13530
- Loading branch information
Showing
2 changed files
with
27 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
```release-note:bug | ||
api: Fix listing evaluations with the wildcard namespace and an ACL token | ||
``` | ||
|
||
```release-note:bug | ||
ui: Fix a bug that prevented viewing the details of an evaluation in a non-default namespace | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
diff --git a/nomad/structs/network.go b/nomad/structs/network.go | ||
index 30e769323..3f7f1c8be 100644 | ||
--- a/nomad/structs/network.go | ||
+++ b/nomad/structs/network.go | ||
@@ -4,6 +4,8 @@ import ( | ||
"fmt" | ||
"math/rand" | ||
"net" | ||
+ "os" | ||
+ "strings" | ||
"sync" | ||
|
||
"github.com/hashicorp/nomad/helper" | ||
@@ -174,6 +176,9 @@ func (idx *NetworkIndex) Overcommitted() bool { | ||
// SetNode is used to setup the available network resources. Returns | ||
// true if there is a collision | ||
func (idx *NetworkIndex) SetNode(node *Node) (collide bool, reason string) { | ||
+ if os.Getenv("CRASH") != "" && strings.HasPrefix(node.Name, "crash") { | ||
+ return true, "crash" | ||
+ } | ||
|
||
// COMPAT(0.11): Remove in 0.11 | ||
// Grab the network resources, handling both new and old |