Skip to content

Commit

Permalink
Merge branch 'main' into webui-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
XandraMcC committed Dec 11, 2023
2 parents 659ae62 + d555438 commit e2c6025
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
9 changes: 9 additions & 0 deletions pkg/orchestrator/evaluation/inmemory_broker.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
// This file contains modifications based on work originally from the HashiCorp Nomad project.
// The original file can be found at:
// https://github.com/hashicorp/nomad/blob/f005448366ed3e796a2f22696d8c063dff4677f8/nomad/eval_broker.go
//
// Both the original work and the modifications in this file are licensed under the Mozilla Public License 2.0.

// Original Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package evaluation

import (
Expand Down
9 changes: 8 additions & 1 deletion pkg/publicapi/client/v2/errors.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
//nolint:unused
// This file includes unmodified code from the HashiCorp Nomad project.
// The original file can be found at:
// https://github.com/hashicorp/nomad/blob/60e0404bb5b6eae2f1281f6702a1c6bddfbbaf0c/api/error_unexpected_response.go
//
// This entire file is licensed under the Mozilla Public License 2.0
// Original Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package client

import (
Expand Down
8 changes: 8 additions & 0 deletions pkg/publicapi/client/v2/util.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
// This file includes unmodified functions from the HashiCorp Nomad project.
// The original file can be found at:
// https://github.com/hashicorp/nomad/blob/fc9076731c7c920ab0373c224ba8e9fd5544d386/api/api.go
//
// This entire file is licensed under the Mozilla Public License 2.0
// Original Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package client

import (
Expand Down

0 comments on commit e2c6025

Please sign in to comment.