Skip to content

Commit

Permalink
Merge branch 'devinwon/polish_contract' into devinwon/CustomSearchDomain
Browse files Browse the repository at this point in the history
  • Loading branch information
Devin Wong committed Apr 15, 2024
2 parents a215f0e + d37c16b commit c84268d
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 127 deletions.
150 changes: 76 additions & 74 deletions pkg/proto/nbcontract/v1/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/proto/nbcontract/v1/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ message Configuration {
bool ensure_no_dupe_promiscuous_bridge = 28;

// Custom search domain configurations
CustomSearchDomain custom_search_domain = 29;
CustomSearchDomainConfig custom_search_domain_config = 29;

// Custom Linux OS configurations including SwapFile, SysCtl configs, etc.
CustomLinuxOSConfig custom_linux_os_config = 30;
Expand Down
Loading

0 comments on commit c84268d

Please sign in to comment.