From 5db217305f37a79eeccd70f000088a06ec82fcec Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Thu, 21 May 2015 14:28:59 -0700
Subject: down-integrate internal changes

---
 src/google/protobuf/unittest.proto | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/google/protobuf/unittest.proto')

diff --git a/src/google/protobuf/unittest.proto b/src/google/protobuf/unittest.proto
index a32291e0..834c9b56 100644
--- a/src/google/protobuf/unittest.proto
+++ b/src/google/protobuf/unittest.proto
@@ -185,6 +185,7 @@ message TestAllTypes {
 message NestedTestAllTypes {
   optional NestedTestAllTypes child = 1;
   optional TestAllTypes payload = 2;
+  repeated NestedTestAllTypes repeated_child = 3;
 }
 
 message TestDeprecatedFields {
@@ -203,6 +204,11 @@ enum ForeignEnum {
   FOREIGN_BAZ = 6;
 }
 
+message TestReservedFields {
+  reserved 2, 15, 9 to 11;
+  reserved "bar", "baz";
+}
+
 message TestAllExtensions {
   extensions 1 to max;
 }
-- 
cgit v1.2.3