Merge pull request elastic#287 from Shweta-Bhandare/2.6.0_ixEngine

2.6.0 ix engine
harper-carroll · Mar 10, 2015 · 84cbee6 · 84cbee6
2 parents fb3c81f + 58d82c5
commit 84cbee6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/protofiles/ConfigReplyMsg.proto b/protofiles/ConfigReplyMsg.proto
@@ -16,5 +16,6 @@ message ConfigReply {
    optional ReplyType replyType = 1;
    optional string errorMessage = 2;
    optional ConfigType configType = 3;
-   optional bytes serializedConfigMessage = 4;
+   optional string overrideExtension = 4;
+   optional bytes serializedConfigMessage = 5;
 }
diff --git a/protofiles/ConfigRequestMsg.proto b/protofiles/ConfigRequestMsg.proto
@@ -15,5 +15,6 @@ message ConfigRequest {
 
    optional RequestType requestType = 1;
    optional ConfigType configType = 2;
-   optional bytes serializedConfigMessage = 3;
+   optional string override = 3;
+   optional bytes serializedConfigMessage = 4;
 }