Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix-vm-is-paused
Browse files Browse the repository at this point in the history
  • Loading branch information
rybnico committed Oct 8, 2024
2 parents 21d1eed + 8be9455 commit 020b543
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions container_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ func (cc *ContainerConfig) MergeDevs() map[string]string {
return cc.Devs
}

// MergeDevs merges and assigns the indexed Mp0..9 fields to a string map
// MergeMps merges and assigns the indexed Mp0..9 fields to a string map
func (cc *ContainerConfig) MergeMps() map[string]string {
if cc.Mps == nil {
cc.Mps = cc.mergeIndexedFields("Mp")
}
return cc.Mps
}

// MergeDevs merges and assigns the indexed Net0..9 fields to a string map
// MergeNets merges and assigns the indexed Net0..9 fields to a string map
func (cc *ContainerConfig) MergeNets() map[string]string {
if cc.Nets == nil {
cc.Nets = cc.mergeIndexedFields("Net")
}
return cc.Nets
}

// MergeDevs merges and assigns the indexed Unused0..9 fields to a string map
// MergeUnuseds merges and assigns the indexed Unused0..9 fields to a string map
func (cc *ContainerConfig) MergeUnuseds() map[string]string {
if cc.Unuseds == nil {
cc.Unuseds = cc.mergeIndexedFields("Unused")
Expand Down

0 comments on commit 020b543

Please sign in to comment.