moby
diff --git a/‎api/api.pb.txt
+10-10 b/‎api/api.pb.txt
+10-10
diff --git a/‎protobuf/plugin/deepcopy/test/deepcopypb_test.go
+82-81 b/‎protobuf/plugin/deepcopy/test/deepcopypb_test.go
+82-81
@@ -2735,8 +2735,8 @@ file {
         label: LABEL_OPTIONAL
         type: TYPE_UINT32
         options {
-          65001: 0
           65003: "os.FileMode"
+          65001: 0
         }
         json_name: "mode"
       }
@@ -2904,8 +2904,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65001: 0
         65011: 1
+        65001: 0
       }
       json_name: "delay"
     }
@@ -3348,8 +3348,8 @@ file {
         }
       }
       options {
-        62001: 0
         62023: "PublishMode"
+        62001: 0
       }
     }
   }
@@ -4055,8 +4055,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_UINT32
       options {
-        65001: 0
         65003: "os.FileMode"
+        65001: 0
       }
       json_name: "mode"
     }
@@ -5052,8 +5052,8 @@ file {
       }
     }
     options {
-      62001: 0
       62023: "NodeRole"
+      62001: 0
     }
   }
   syntax: "proto3"
@@ -9739,8 +9739,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65001: 0
         65011: 1
+        65001: 0
       }
       json_name: "period"
     }
@@ -10958,14 +10958,14 @@ file {
     }
   }
   options {
-    63001: 0
-    63002: 0
     63017: 1
-    63018: 1
     63020: 1
+    63018: 1
+    63001: 0
+    63002: 0
+    63035: 0
     63026: 0
     63034: 0
-    63035: 0
   }
 }
 file {
Original file line number	Diff line number	Diff line change
`@@ -2735,8 +2735,8 @@ file {`
`2735`	`2735`	`label: LABEL_OPTIONAL`
`2736`	`2736`	`type: TYPE_UINT32`
`2737`	`2737`	`options {`
`2738`		`- 65001: 0`
`2739`	`2738`	`65003: "os.FileMode"`
	`2739`	`+ 65001: 0`
`2740`	`2740`	`}`
`2741`	`2741`	`json_name: "mode"`
`2742`	`2742`	`}`
`@@ -2904,8 +2904,8 @@ file {`
`2904`	`2904`	`type: TYPE_MESSAGE`
`2905`	`2905`	`type_name: ".google.protobuf.Duration"`
`2906`	`2906`	`options {`
`2907`		`- 65001: 0`
`2908`	`2907`	`65011: 1`
	`2908`	`+ 65001: 0`
`2909`	`2909`	`}`
`2910`	`2910`	`json_name: "delay"`
`2911`	`2911`	`}`
`@@ -3348,8 +3348,8 @@ file {`
`3348`	`3348`	`}`
`3349`	`3349`	`}`
`3350`	`3350`	`options {`
`3351`		`- 62001: 0`
`3352`	`3351`	`62023: "PublishMode"`
	`3352`	`+ 62001: 0`
`3353`	`3353`	`}`
`3354`	`3354`	`}`
`3355`	`3355`	`}`
`@@ -4055,8 +4055,8 @@ file {`
`4055`	`4055`	`label: LABEL_OPTIONAL`
`4056`	`4056`	`type: TYPE_UINT32`
`4057`	`4057`	`options {`
`4058`		`- 65001: 0`
`4059`	`4058`	`65003: "os.FileMode"`
	`4059`	`+ 65001: 0`
`4060`	`4060`	`}`
`4061`	`4061`	`json_name: "mode"`
`4062`	`4062`	`}`
`@@ -5052,8 +5052,8 @@ file {`
`5052`	`5052`	`}`
`5053`	`5053`	`}`
`5054`	`5054`	`options {`
`5055`		`- 62001: 0`
`5056`	`5055`	`62023: "NodeRole"`
	`5056`	`+ 62001: 0`
`5057`	`5057`	`}`
`5058`	`5058`	`}`
`5059`	`5059`	`syntax: "proto3"`
`@@ -9739,8 +9739,8 @@ file {`
`9739`	`9739`	`type: TYPE_MESSAGE`
`9740`	`9740`	`type_name: ".google.protobuf.Duration"`
`9741`	`9741`	`options {`
`9742`		`- 65001: 0`
`9743`	`9742`	`65011: 1`
	`9743`	`+ 65001: 0`
`9744`	`9744`	`}`
`9745`	`9745`	`json_name: "period"`
`9746`	`9746`	`}`
`@@ -10958,14 +10958,14 @@ file {`
`10958`	`10958`	`}`
`10959`	`10959`	`}`
`10960`	`10960`	`options {`
`10961`		`- 63001: 0`
`10962`		`- 63002: 0`
`10963`	`10961`	`63017: 1`
`10964`		`- 63018: 1`
`10965`	`10962`	`63020: 1`
	`10963`	`+ 63018: 1`
	`10964`	`+ 63001: 0`
	`10965`	`+ 63002: 0`
	`10966`	`+ 63035: 0`
`10966`	`10967`	`63026: 0`
`10967`	`10968`	`63034: 0`
`10968`		`- 63035: 0`
`10969`	`10969`	`}`
`10970`	`10970`	`}`
`10971`	`10971`	`file {`