Skip to content

Commit

Permalink
Merge pull request #11842 from hashicorp/b-name-oss-files-consistently
Browse files Browse the repository at this point in the history
chore: ensure consistent file naming for non-enterprise files.
  • Loading branch information
jrasell authored Jan 14, 2022
2 parents c08a036 + e961751 commit 8f01d74
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion nomad/fsm_not_ent.go → nomad/fsm_oss.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ package nomad

// allocQuota returns the quota object associated with the allocation. In
// anything but Premium this will always be empty
func (n *nomadFSM) allocQuota(allocID string) (string, error) {
func (n *nomadFSM) allocQuota(_ string) (string, error) {
return "", nil
}
2 changes: 1 addition & 1 deletion nomad/plan_apply_not_ent.go → nomad/plan_apply_oss.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ func refreshIndex(snap *state.StateSnapshot) (uint64, error) {
}

// evaluatePlanQuota returns whether the plan would be over quota
func evaluatePlanQuota(snap *state.StateSnapshot, plan *structs.Plan) (bool, error) {
func evaluatePlanQuota(_ *state.StateSnapshot, _ *structs.Plan) (bool, error) {
return false, nil
}
8 changes: 0 additions & 8 deletions scheduler/stack_not_ent.go

This file was deleted.

8 changes: 8 additions & 0 deletions scheduler/stack_oss.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//go:build !ent
// +build !ent

package scheduler

func NewQuotaIterator(_ Context, source FeasibleIterator) FeasibleIterator {
return source
}

0 comments on commit 8f01d74

Please sign in to comment.