mirror of
https://github.com/kubernetes/sample-controller.git
synced 2026-04-12 00:00:26 +08:00
Merge pull request #59842 from ixdy/update-rules_go-02-2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update bazelbuild/rules_go, kubernetes/repo-infra, and gazelle dependencies **What this PR does / why we need it**: updates our bazelbuild/rules_go dependency in order to bump everything to go1.9.4. I'm separating this effort into two separate PRs, since updating rules_go requires a large cleanup, removing an attribute from most build rules. **Release note**: ```release-note NONE ``` Kubernetes-commit: 96ec3187180b9c1d722756b3ea0984ebe65424dc
This commit is contained in:
+2
-2
@@ -423,7 +423,7 @@ func normalizeElementOrder(patch, serverOnly, patchOrder, serverOrder []interfac
|
||||
// scan from the place of last insertion in `right` to the end of `right`,
|
||||
// the place is before the first item that is greater than the item we want to insert.
|
||||
// example usage: using server-only items as left and patch items as right. We insert server-only items
|
||||
// to patch list. We use the order of live object as record for comparision.
|
||||
// to patch list. We use the order of live object as record for comparison.
|
||||
func mergeSortedSlice(left, right, serverOrder []interface{}, mergeKey string, kind reflect.Kind) []interface{} {
|
||||
// Returns if l is less than r, and if both have been found.
|
||||
// If l and r both present and l is in front of r, l is less than r.
|
||||
@@ -2109,7 +2109,7 @@ func sliceTypeAssertion(original, patch interface{}) ([]interface{}, []interface
|
||||
}
|
||||
|
||||
// extractRetainKeysPatchStrategy process patch strategy, which is a string may contains multiple
|
||||
// patch strategies seperated by ",". It returns a boolean var indicating if it has
|
||||
// patch strategies separated by ",". It returns a boolean var indicating if it has
|
||||
// retainKeys strategies and a string for the other strategy.
|
||||
func extractRetainKeysPatchStrategy(strategies []string) (bool, string, error) {
|
||||
switch len(strategies) {
|
||||
|
||||
Reference in New Issue
Block a user