github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 12:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27091 from mml/union-merge

Browse Source 
Automatic merge from submit-queue

Mark known-flags to merge via union.
This commit is contained in:
k8s-merge-robot
2016-06-08 17:11:02 -07:00
parent 613bbbb131 52f6b27365
commit 6986a3b2e2
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/verify-flags/.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
known-flags.txt merge=union