Skip to content

Commit

Permalink
Fixing felix.go merge
Browse files Browse the repository at this point in the history
  • Loading branch information
nwoodmsft committed Dec 5, 2017
1 parent 5ef6386 commit 0bf0190
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion felix.go
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,8 @@ func (fc *DataplaneConnector) sendMessagesToDataplaneDriver() {
}
for kOld, vOld := range config {
logCxt := log.WithFields(log.Fields{"key": kOld, "old": vOld, "updateType": "delete"})
if _, prs := config[kOld]; prs {
if _, prs := msg.Config[kOld]; prs {
// Key was present in the message so we've handled above.
continue
}
if handledConfigChanges.Contains(kOld) {
Expand Down

0 comments on commit 0bf0190

Please sign in to comment.