Skip to content

Commit

Permalink
all merge conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
Louis Murray committed Jun 5, 2018
2 parents b4ba371 + 9f50e04 commit c67ccc5
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/skaffold/schema/v1alpha2/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ type HelmDeploy struct {
Releases []HelmRelease `yaml:"releases,omitempty"`
}

// HelmRelease contains the configuration of all possible fields that could be leveraged
// when doing a helm deploy
type HelmRelease struct {
Name string `yaml:"name"`
ChartPath string `yaml:"chartPath"`
Expand Down

0 comments on commit c67ccc5

Please sign in to comment.