Merge pull request elastic#464 from Jacob-Delgado/fixup-allconf

US14515 new fields should not reuse numbers; rename fields in protobuffer
harper-carroll · Jan 29, 2016 · 7d65e12 · 7d65e12
2 parents d0cc345 + 91623d6
commit 7d65e12
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/protofiles/configelements/AllConf.proto b/protofiles/configelements/AllConf.proto
@@ -10,8 +10,14 @@ message AllConfConfig {
    optional int32 hostPort = 2;
    optional string assetPath = 3;
    optional string configServerQueue = 4;
-   optional EncryptedString adminUsername = 5;
-   optional EncryptedString adminPassword = 6;
-   optional EncryptedString devUsername = 7;
-   optional EncryptedString devPassword = 8;
+
+//   optional string adminUsername = 5;
+//   optional string adminPassword = 6;
+//   optional string devUsername = 7;
+//   optional string devPassword = 8;
+
+   optional EncryptedString administratorUsername = 9;
+   optional EncryptedString administratorPassword = 10;
+   optional EncryptedString developerUsername = 11;
+   optional EncryptedString developerPassword = 12;
 }