geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [24/24] incubator-geode git commit: GEODE-1372 Updated analyzeSerializable test and headers.
Date Mon, 29 Aug 2016 21:39:26 GMT
GEODE-1372 Updated analyzeSerializable test and headers.

Fixed junit failure for FindCoordinatorrequest.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/95aa2e28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/95aa2e28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/95aa2e28

Branch: refs/heads/develop
Commit: 95aa2e284186a3478d91bd71e5ebe43cc56eb2e9
Parents: f53f5c2
Author: Hitesh Khamesra <hkhamesra@pivotal.io>
Authored: Wed Jun 15 09:40:29 2016 -0700
Committer: Hitesh Khamesra <hkhamesra@pivotal.io>
Committed: Mon Aug 29 10:39:19 2016 -0700

----------------------------------------------------------------------
 .../gms/locator/FindCoordinatorRequest.java     |  1 +
 .../ReconnectWithUDPSecurityDUnitTest.java      | 16 ++++
 .../LocatorUDPSecurityDUnitTest.java            | 16 ++++
 .../sanctionedDataSerializables.txt             | 78 ++++++++++++++++----
 4 files changed, 97 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/95aa2e28/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java
index 4e582d8..d9d5dc9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java
@@ -42,6 +42,7 @@ public class FindCoordinatorRequest extends HighPriorityDistributionMessage
 
   public FindCoordinatorRequest(InternalDistributedMember myId) {
     this.memberID = myId;
+    this.dhalgo = "";
   }
   
   public FindCoordinatorRequest(InternalDistributedMember myId, Collection<InternalDistributedMember>
rejectedCoordinators, 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/95aa2e28/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java
index bbd35d9..c910f73 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache30;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/95aa2e28/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
index 08cf40a..7e3658c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.distributed;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/95aa2e28/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index 5172709..0589618 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -285,28 +285,33 @@ fromData,16,2a2bb700172a2bb900180100b50008b1
 toData,16,2a2bb700192b2ab40008b9001a0200b1
 
 com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember,6
-fromData,33,2a2bb6009b2ab4001bb20091b60071a100112ab400292bb900920200a700044db1
-fromDataPre_GFE_7_1_0_0,292,2bb8009c4d2bb9009d01003e2a2bb80089b500062ab2000399000e2c2ab40006b8009ea700072cb60007b500062bb9009f010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2a2bb9009d0100b500112a2bb9009d0100b500022a2bb9009f0100b500132a2bb8008bb500202a2bb80089b500182ab40013100da0000e2a2bb80089b50019a700172bb800893a071907c6000c2a1907b800a0b500142bb800893a072bb8008cb6008d36082abb008e5919071508b7008fb5001ebb0034592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700353a092a2c1d150515062bb800a1b600711909b80028b500292ab7000b2ab400139e000704a7000403b80043b1
-fromDataPre_GFE_9_0_0_0,296,2bb8009c4d2bb9009d01003e2a2bb80089b500062ab2000399000e2c2ab40006b8009ea700072cb60007b500062bb9009f010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2a2bb9009d0100b500112a2bb9009d0100b500022a2bb9009f0100b500132a2bb8008bb500202a2bb80089b500182ab40013100da0000e2a2bb80089b50019a700172bb800893a071907c6000c2a1907b800a0b500142bb800893a072bb8008cb6008d36082abb008e5919071508b7008fb5001e2a15042bb70090bb0034592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700353a092a2c1d150515062ab4001b1909b80028b500292ab7000b2ab400139e000704a7000403b80043b1
-toData,29,2a2bb600952ab4001bb20091b60071a1000d2ab600962bb900850200b1
-toDataPre_GFE_7_1_0_0,226,2ab400139e000704a7000403b800432ab6004f2bb800972b2ab6004eb9009802002ab400062bb8007c033d2ab40029b9007d01009900071c04803d2ab40029b9006c01009900071c05803d2ab4003a9900071c07803d2b1c1100ff7e91b9009902002b2ab40011b9009802002b2ab40002b9009802002b2ab40013b9009902002ab400202bb8007f2ab400182bb8007c2ab40013100da0000e2ab400192bb8007ca7000e2ab40014b8009a2bb8007c2ab4001ec700081247a7000a2ab4001eb600802bb8007c2ab4001ec7000911012ca7000a2ab4001eb60081b800822bb80083b1
-toDataPre_GFE_9_0_0_0,240,2ab400139e000704a7000403b800432ab6004f2bb800972b2ab6004eb9009802002ab400062bb8007c033d2ab40029b9007d01009900071c04803d2ab40029b9006c01009900071c05803d2ab4003a9900071c07803d1c1008803d2b1c1100ff7e91b9009902002b2ab40011b9009802002b2ab40002b9009802002b2ab40013b9009902002ab400202bb8007f2ab400182bb8007c2ab40013100da0000e2ab400192bb8007ca7000e2ab40014b8009a2bb8007c2ab4001ec700081247a7000a2ab4001eb600802bb8007c2ab4001ec7000911012ca7000a2ab4001eb60081b800822bb800832b2ab4001b04b80084b1
+fromData,33,2a2bb6009c2ab4001bb20092b60072a100112ab400292bb900930200a700044db1
+fromDataPre_GFE_7_1_0_0,292,2bb8009d4d2bb9009e01003e2a2bb8008ab500062ab2000399000e2c2ab40006b8009fa700072cb60007b500062bb900a0010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2a2bb9009e0100b500112a2bb9009e0100b500022a2bb900a00100b500132a2bb8008cb500202a2bb8008ab500182ab40013100da0000e2a2bb8008ab50019a700172bb8008a3a071907c6000c2a1907b800a1b500142bb8008a3a072bb8008db6008e36082abb008f5919071508b70090b5001ebb0034592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700353a092a2c1d150515062bb800a2b600721909b80028b500292ab7000b2ab400139e000704a7000403b80043b1
+fromDataPre_GFE_9_0_0_0,296,2bb8009d4d2bb9009e01003e2a2bb8008ab500062ab2000399000e2c2ab40006b8009fa700072cb60007b500062bb900a0010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2a2bb9009e0100b500112a2bb9009e0100b500022a2bb900a00100b500132a2bb8008cb500202a2bb8008ab500182ab40013100da0000e2a2bb8008ab50019a700172bb8008a3a071907c6000c2a1907b800a1b500142bb8008a3a072bb8008db6008e36082abb008f5919071508b70090b5001e2a15042bb70091bb0034592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700353a092a2c1d150515062ab4001b1909b80028b500292ab7000b2ab400139e000704a7000403b80043b1
+toData,29,2a2bb600962ab4001bb20092b60072a1000d2ab600972bb900860200b1
+toDataPre_GFE_7_1_0_0,226,2ab400139e000704a7000403b800432ab600502bb800982b2ab6004fb9009902002ab400062bb8007d033d2ab40029b9007e01009900071c04803d2ab40029b9006d01009900071c05803d2ab4003a9900071c07803d2b1c1100ff7e91b9009a02002b2ab40011b9009902002b2ab40002b9009902002b2ab40013b9009a02002ab400202bb800802ab400182bb8007d2ab40013100da0000e2ab400192bb8007da7000e2ab40014b8009b2bb8007d2ab4001ec700081247a7000a2ab4001eb600812bb8007d2ab4001ec7000911012ca7000a2ab4001eb60082b800832bb80084b1
+toDataPre_GFE_9_0_0_0,240,2ab400139e000704a7000403b800432ab600502bb800982b2ab6004fb9009902002ab400062bb8007d033d2ab40029b9007e01009900071c04803d2ab40029b9006d01009900071c05803d2ab4003a9900071c07803d1c1008803d2b1c1100ff7e91b9009a02002b2ab40011b9009902002b2ab40002b9009902002b2ab40013b9009a02002ab400202bb800802ab400182bb8007d2ab40013100da0000e2ab400192bb8007da7000e2ab40014b8009b2bb8007d2ab4001ec700081247a7000a2ab4001eb600812bb8007d2ab4001ec7000911012ca7000a2ab4001eb60082b800832bb800842b2ab4001b04b80085b1
 
 com/gemstone/gemfire/distributed/internal/membership/NetView,2
+<<<<<<< HEAD
 fromData,90,2a2bb80065c00023b5000e2a2bb900660100b500032a2bb80067b50006b200389a00122ab40006c7000bbb003959b7003abf2abb0007592ab40006b70008b500092a2bb80068b5000b2a2bb80068b5000d2a2bb80069b50002b1
 toData,52,2ab4000e2bb800602b2ab40003b9006102002a2ab400062bb700622ab4000b2bb800632ab4000d2bb800632ab400022bb80064b1
+=======
+fromData,77,2a2bb80064c0002bb500112a2bb900650100b500062a2bb80066b500092abb000a592ab40009b7000bb5000c2a2bb80067b5000e2a2bb80067b500102a2bb80068b500052a2bb80069b50004b1
+toData,60,2ab400112bb8005e2b2ab40006b9005f02002a2ab400092bb700602ab4000e2bb800612ab400102bb800612ab400052bb800622ab400042bb80063b1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember,2
 fromData,150,2a2bb80046b5001a2bb9004701003d2a1c047e99000704a7000403b500182a1c057e99000704a7000403b500192a2bb80048b500152a2bb900490100b500022a2bb900490100b500032a2bb900490100b500052a2bb9004a0100b5003b2a2bb9004a0100b500072a2bb900490100b500062a2bb8004bb500082a2bb8004cb500092a2bb9004d0100b5001b2a2bb9004d0100b5001cb1
 toData,145,2b2ab4001a04b8003e033d2ab400189900071c04803d2ab400199900071c05803d2b1cb9003f02002ab400152bb800402b2ab40002b9004102002b2ab40003b9004102002b2ab40005b9004102002b2ab4003bb9004202002b2ab40007b9004202002b2ab40006b9004102002ab400082bb800432ab400092bb800442b2ab4001bb9004503002b2ab4001cb900450300b1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorRequest,2
-fromData,71,2a2bb80017c00016b500022bb9001801003d2abb0019591cb7001ab50003033e1d1ca2001a2ab400032bb80017c00016b9001b020057840301a7ffe72a2bb900180100b50004b1
-toData,88,2ab400022bb800102ab40003c6003a2b2ab40003b900110100b9001202002ab40003b9001301004d2cb9001401009900152cb900150100c000164e2d2bb80010a7ffe8a7000a2b03b9001202002b2ab40004b900120200b1
+fromData,97,2a2bb8001cc00019b500022bb9001d01003d2abb001e591cb7001fb50003033e1d1ca2001a2ab400032bb8001cc00019b90020020057840301a7ffe72a2bb9001d0100b500042a2bb9001d0100b500062a2bb80021b500072a2bb80022b50005b1
+toData,114,2ab400022bb800132ab40003c6003a2b2ab40003b900140100b9001502002ab40003b9001601004d2cb9001701009900152cb900180100c000194e2d2bb80013a7ffe8a7000a2b03b9001502002b2ab40004b9001502002b2ab40006b9001502002ab400072bb8001a2ab400052bb8001bb1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse,2
-fromData,89,2a2bb80021c00022b500022a2bb80021c00022b500032a2bb900230100b500092ab400099a00342a2bb900230100b500042a2bb900230100b500072a2bb900230100b500082a2bb80021c00024b500052a2bb80025b50006b1
-toData,73,2ab400022bb8001e2ab400032bb8001e2b2ab40009b9001f02002b2ab40004b9001f02002b2ab40007b9001f02002b2ab40008b9001f02002ab400052bb8001e2ab400062bb80020b1
+fromData,105,2a2bb80026c00027b500022a2bb80026c00027b500032a2bb80028b5000a2a2bb80029b5000c2a2bb9002a0100b500092ab400099a00342a2bb9002a0100b500042a2bb9002a0100b500072a2bb9002a0100b500082a2bb80026c0002bb500052a2bb8002cb50006b1
+toData,89,2ab400022bb800212ab400032bb800212ab4000a2bb800222ab4000c2bb800232b2ab40009b9002402002b2ab40004b9002402002b2ab40007b9002402002b2ab40008b9002402002ab400052bb800212ab400062bb80025b1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/locator/GetViewRequest,2
 fromData,1,b1
@@ -329,12 +334,12 @@ fromData,49,2a2bb700112a2bb900120100b500072ab800132bb90012010032b500052a2bb80014
 toData,45,2a2bb7000d2b2ab40007b9000e02002b2ab40005b6000fb9000e02002ab400022bb800102ab400062bb80010b1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/messages/JoinRequestMessage,2
-fromData,38,2a2bb80019c0001ab500042a2bb80019b500052a2bb8001bb500022a2bb9001c0100b6001db1
-toData,35,2ab400042bb800152ab400052bb800152ab400022bb800162b2ab60017b900180200b1
+fromData,48,2a2bb8001bc0001cb500042a2bb8001bb500052a2bb8001db500022a2bb9001e0100b6001f2a2bb900200100b50006b1
+toData,45,2ab400042bb800162ab400052bb800162ab400022bb800172b2ab60018b9001902002b2ab40006b9001a0200b1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/messages/JoinResponseMessage,2
-fromData,39,2a2bb80019c0001ab500022a2bb80019c0001bb500032a2bb8001cb500052a2bb8001db50006b1
-toData,33,2ab400022bb800162ab400032bb800162ab400052bb800172ab400062bb80018b1
+fromData,47,2a2bb8001bc0001cb500022a2bb8001bc0001db500032a2bb8001eb500072a2bb8001fb500082a2bb8001fb50006b1
+toData,41,2ab400022bb800182ab400032bb800182ab400072bb800192ab400082bb8001a2ab400062bb8001ab1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/messages/LeaveRequestMessage,2
 fromData,20,2a2bb8000cc0000db500032a2bb8000eb50004b1
@@ -871,8 +876,13 @@ fromData,93,2a2bb7000a2a2bb8000bb6000cb500032a2bb8000db6000eb500042a2bb8000fb600
 toData,91,2a2bb700132ab40003b800142bb800152ab40004b800162bb800172ab40005b800182bb800192b2ab40009b9001a02002ab400099e00262ab400074d2cbe3e03360415041da200152c1504323a0519052bb8001b840401a7ffebb1
 
 com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor$CacheProfile,2
+<<<<<<< HEAD
 fromData,113,2a2bb700692bb9006a01003d2a1cb6001e2a1cb7006b9900162abb006c59b7006db500282ab400282bb8006e2a1cb7006f99000e2a2bb80070c00071b5000e2a1cb7007299000e2a2bb80070c00071b5000f2a2bb80070c00073b500192a1cb7007499000e2a2bb80070c00075b50018b1
 toData,101,2a2bb700612b2ab6001db9006202002ab40028c6000b2ab400282bb800632ab4000eb9002e01009a000c2a2ab4000e2bb700642ab4000fb9002e01009a000c2a2ab4000f2bb700642ab400192bb800652ab40018b9003201009a000b2ab400182bb80065b1
+=======
+fromData,113,2a2bb7006a2bb9006b01003d2a1cb6001e2a1cb7006c9900162abb006d59b7006eb500282ab400282bb8006f2a1cb7007099000e2a2bb80071c00072b5000e2a1cb7007399000e2a2bb80071c00072b5000f2a2bb80071c00074b500192a1cb7007599000e2a2bb80071c00076b50018b1
+toData,101,2a2bb700622b2ab6001db9006302002ab40028c6000b2ab400282bb800642ab4000eb9002e01009a000c2a2ab4000e2bb700652ab4000fb9002e01009a000c2a2ab4000f2bb700652ab400192bb800662ab40018b9003201009a000b2ab400182bb80066b1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/CacheServerAdvisor$CacheServerProfile,2
 fromData,53,2a2bb700112a2bb80012b500042a2bb900130100b500062abb001459b70015b500052ab400052bb800162a2bb900170100b60018b1
@@ -970,8 +980,13 @@ fromData,197,2a2bb7003a2a2bb8003bc0003cb500062a2bb8003d88b500162a2ab40016bd003eb
 toData,165,2a2bb700492ab400062bb8004a2ab40016852bb8004b2ab400169e007bbb004c592ab40016b7004d4d033e03360415042ab40016a200511d9a00122ab40007150432b4002cc60005043e2ab40007150432b4002c3a052c1905b6004e572ab4000715043201b5002c2ab400071504322bb6004f2ab400071504321905b5002c840401a7ffac2b1db9005002001d9900082c2bb800512ab4000cc6000b2ab4000c2bb8004ab1
 
 com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage,2
+<<<<<<< HEAD
 fromData,171,2a2bb700632bb9006401003d1c047e9900142a2bb900650100b500092ab40009b800661c077e99000d2a2bb900650100b500061c057e99000e2a2bb80067c00068b500072bb800674e2dc100699900252a03b5000e2a2dc00069b8006ab500082ab40008c7001b2a2dc00069b5004ea700102a2dc0006bb500082a04b5000e2a2bb80067c0006cb5000a2a2bb8006db5000c2a2bb8006eb5000b2a1c10407e99000704a7000403b5000db1
 toData,173,2a2bb70070033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007102002ab4000999000d2b2ab40009b9007202002ab40006029f000d2b2ab40006b9007202002ab40007c6000b2ab400072bb800732ab4000e99000e2ab400082bb80073a700102ab40008b9005901002bb800732ab4000a2bb800732ab4000cc000742bb800752ab4000b2bb80076b1
+=======
+fromData,171,2a2bb700622bb9006301003d1c047e9900142a2bb900640100b500092ab40009b800651c077e99000d2a2bb900640100b500061c057e99000e2a2bb80066c00067b500072bb800664e2dc100689900252a03b5000e2a2dc00068b80069b500082ab40008c7001b2a2dc00068b5004da700102a2dc0006ab500082a04b5000e2a2bb80066c0006bb5000a2a2bb8006cb5000c2a2bb8006db5000b2a1c10407e99000704a7000403b5000db1
+toData,173,2a2bb7006f033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007002002ab4000999000d2b2ab40009b9007102002ab40006029f000d2b2ab40006b9007102002ab40007c6000b2ab400072bb800722ab4000e99000e2ab400082bb80072a700102ab40008b9005801002bb800722ab4000a2bb800722ab4000cc000732bb800742ab4000b2bb80075b1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
 toData,136,2ab4000a4d2c2bb8003f2b2ab40010b40040b9004102002ab400063e2ab40022c600081d0780913e2ab40015c600191d100880913e2ab40015c100429900091d102080913e1d108080913e2b1db9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
@@ -1103,8 +1118,13 @@ fromData,24,2a2bb7001e2a2bb8001fb500042a2bb900200100b50002b1
 toData,24,2a2bb700212ab400042bb800222b2ab40002b900230200b1
 
 com/gemstone/gemfire/internal/cache/InitialImageOperation$RequestImageMessage,2
+<<<<<<< HEAD
 fromData,98,2a2bb700b42a2bb800b5b500172a2bb900b60100b500022a2bb900b70100b500552a2bb900b70100b500032a2bb900b70100b5004b2a2bb800b8c000b9b5003a2a2bb800b8c000bab500262a2bb800b8c000bbb5003b2a2bb800b8c000bcb50030b1
 toData,86,2a2bb700bd2ab400172bb800be2b2ab40002b900bf02002b2ab40055b900c002002b2ab40003b900c002002b2ab4004bb900c002002ab4003a2bb800c12ab400262bb800c12ab4003b2bb800c12ab400302bb800c1b1
+=======
+fromData,98,2a2bb700b22a2bb800b3b500172a2bb900b40100b500022a2bb900b50100b500542a2bb900b50100b500032a2bb900b50100b5004a2a2bb800b6c000b7b5003a2a2bb800b6c000b8b500262a2bb800b6c000b9b5003b2a2bb800b6c000bab50030b1
+toData,86,2a2bb700bb2ab400172bb800bc2b2ab40002b900bd02002b2ab40054b900be02002b2ab40003b900be02002b2ab4004ab900be02002ab4003a2bb800bf2ab400262bb800bf2ab4003b2bb800bf2ab400302bb800bfb1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/InitialImageOperation$RequestRVVMessage,2
 fromData,34,2a2bb7001e2a2bb8001fb500052a2bb900200100b500022a2bb900210100b50003b1
@@ -1119,8 +1139,13 @@ fromData,33,2a2bb80010b500052a2bb80011b500062a2bb80012b500072a2bb80013b50008b1
 toData,36,2ab400052bb8000b2ab40006c0000c2bb8000d2ab400072bb8000e2ab400082bb8000fb1
 
 com/gemstone/gemfire/internal/cache/InvalidateOperation$InvalidateMessage,2
+<<<<<<< HEAD
 fromData,25,2a2bb700282a2bb80029c0002ab500022a2bb80029b50015b1
 toData,22,2a2bb7002b2ab400022bb8002c2ab400152bb8002cb1
+=======
+fromData,25,2a2bb700292a2bb8002ac0002bb500022a2bb8002ab50016b1
+toData,22,2a2bb7002c2ab400022bb8002d2ab400162bb8002db1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/InvalidateOperation$InvalidateWithContextMessage,2
 fromData,14,2a2bb7000c2a2bb8000db50004b1
@@ -1230,8 +1255,13 @@ fromData,52,2a2bb700242bb9002501003d1c047e99000704a70004033e1c057e99000704a70004
 toData,57,2a2bb70020033d2ab40003c600081c0480913d2ab40003c100219900081c0580913d2b1cb9002202002ab40003c6000b2ab400032bb80023b1
 
 com/gemstone/gemfire/internal/cache/RemoteOperationMessage,2
+<<<<<<< HEAD
 fromData,43,2a2bb7005a2a2bb9005b0100b5005c2a2ab4005c2bb6005d2a2bb8005eb5000a2a2bb9005f0100b50006b1
 toData,103,2a2bb700602ab600613d2b1cb9006202002ab4000c99000d2b2ab4000cb9006302002ab4006499000d2b2ab40064b9006502002ab60015029f000d2b2ab60015b9006302002ab60016c6000b2ab600162bb800662ab4000a2bb800672b2ab40006b900680200b1
+=======
+fromData,43,2a2bb700592a2bb9005a0100b5005b2a2ab4005b2bb6005c2a2bb8005db5000a2a2bb9005e0100b50006b1
+toData,103,2a2bb7005f2ab600603d2b1cb9006102002ab4000c99000d2b2ab4000cb9006202002ab4006399000d2b2ab40063b9006402002ab60015029f000d2b2ab60015b9006202002ab60016c6000b2ab600162bb800652ab4000a2bb800662b2ab40006b900670200b1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/RemotePutAllMessage,2
 fromData,223,2a2bb700502a2bb80051c00052b500382a2bb80051b5003a2a2ab4005310087e99000704a7000403b500052ab4005310407e99000e2a2bb80051c00054b5004e2a2ab400531100807e99000704a7000403b500042a2bb8005588b500072a2ab40007bd0056b500062ab400079e00722bb800574dbb005859b700594e03360415042ab40007a200202ab400061504bb0056592b2ab4003815042c2db7005a53840401a7ffdd2bb9005b01003604150499002f2bb8005c3a0503360615062ab40007a2001d2ab4000615063219051506b6005dc0001fb50020840601a7ffe0b1
@@ -1414,8 +1444,13 @@ fromData,62,2a2bb700292a2bb8002ab500082a2bb9002b0100b500022ab40002b8002c2a2bb800
 toData,52,2a2bb7002f2ab400082bb800302b2ab40002b9003102002ab400052bb800322b2ab40003b9003302002b2ab40004b900330200b1
 
 com/gemstone/gemfire/internal/cache/UpdateEntryVersionOperation$UpdateEntryVersionMessage,2
+<<<<<<< HEAD
 fromData,45,2a2bb7002e2a2bb8002fc00030b500022a2bb8002fb500092bb800314d2cb6003299000b2a2bb80033b50005b1
 toData,118,2a2bb700342ab400022bb800352ab400092bb800352ab40003b60036c0001b4d2cc1003799002e2cb600384e2db60039990018b2003a2bb8003b2ab40003b6003c2bb8003da7000ab2003e2bb8003ba700262cb6003f990018b2003a2bb8003b2ab40003b6003c2bb8003da7000ab2003e2bb8003bb1
+=======
+fromData,45,2a2bb7002f2a2bb80030c00031b500022a2bb80030b500092bb800324d2cb6003399000b2a2bb80034b50005b1
+toData,118,2a2bb700352ab400022bb800362ab400092bb800362ab40003b60037c0001b4d2cc1003899002e2cb600394e2db6003a990018b2003b2bb8003c2ab40003b6003d2bb8003ea7000ab2003f2bb8003ca700262cb60040990018b2003b2bb8003c2ab40003b6003d2bb8003ea7000ab2003f2bb8003cb1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/UpdateOperation$UpdateMessage,2
 fromData,144,2a2bb700692bb9006a01003d1cb2006b7e99000704a70004033e1d9900332abb006c59b7006db500042ab400042bb8006e2bb9006f0100360415049900102a2bb900700100b80006b50007a700082a01b500042a2bb80071b5000d2a1cb200727e91b5000a2ab6002899000e2a2bb80073b50026a7001b2a2bb80073b5000f1cb200747e99000b2a2bb80073b50026b1
@@ -1552,8 +1587,13 @@ fromData,6,2a2bb7001db1
 toData,6,2a2bb7001bb1
 
 com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage,2
+<<<<<<< HEAD
 fromData,134,2a2bb700662a2bb80067b700682a2bb80067b500092a2bb900690100b8006ab5000b2a2bb9006b0100b5000c2a2bb8006cb5000e2a2bb80067c0006db500192a2bb80067c0006eb500102a2bb80067b500052ab4006f1104007e99000704a70004033d1c9900162abb007059b70071b500722ab400722bb800732a2bb80067c00074b50012b1
 toData,100,2a2bb700752ab600762bb800772ab400092bb800772b2ab4000bb40078b9007902002b2ab4000cb9007a02002ab4000e2bb800772ab400192bb800772ab400102bb800772ab400052bb800772ab40072c6000b2ab400722bb8007b2ab400122bb80077b1
+=======
+fromData,134,2a2bb700652a2bb80066b700672a2bb80066b500092a2bb900680100b80069b5000b2a2bb9006a0100b5000c2a2bb8006bb5000e2a2bb80066c0006cb500192a2bb80066c0006db500102a2bb80066b500052ab4006e1104007e99000704a70004033d1c9900162abb006f59b70070b500712ab400712bb800722a2bb80066c00073b50012b1
+toData,100,2a2bb700742ab600752bb800762ab400092bb800762b2ab4000bb40077b9007802002b2ab4000cb9007902002ab4000e2bb800762ab400192bb800762ab400102bb800762ab400052bb800762ab40071c6000b2ab400712bb8007a2ab400122bb80076b1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage$DestroyReplyMessage,2
 fromData,52,2a2bb700252bb9002601003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80027b5000bb1
@@ -1624,8 +1664,13 @@ fromData,36,2a2bb700252a2bb900260100b500022a2bb900260100b500032a2bb900260100b500
 toData,36,2a2bb700272b2ab40002b9002802002b2ab40003b9002802002b2ab40004b900280200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/GetMessage,2
+<<<<<<< HEAD
 fromData,43,2a2bb700502a2bb80051b500052a2bb80051b500062a2bb80051c00052b500072a2bb900530100b50008b1
 toData,40,2a2bb700542ab400052bb800552ab400062bb800552ab400072bb800552b2ab40008b900560200b1
+=======
+fromData,43,2a2bb700512a2bb80052b500052a2bb80052b500062a2bb80052c00053b500072a2bb900540100b50008b1
+toData,40,2a2bb700552ab400052bb800562ab400062bb800562ab400072bb800562b2ab40008b900570200b1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/partitioned/GetMessage$GetReplyMessage,2
 fromData,77,2a2bb700292bb9002a01003d1c10087e99000704a7000403593e9900091c10f77e913d2a1cb500072a2bb8002bb5002c1c049f000b2a2bb8002db5002e1d99000e2a2bb8002fc00030b5000ab1
@@ -1712,8 +1757,13 @@ fromData,49,2a2bb700362a2bb80037b500062a2bb900380100b80039b500082a2bb80037c0003a
 toData,43,2a2bb7003c2ab7000f2bb8003d2b2ab40008b4003eb9003f02002ab4000a2bb8003d2ab4000c2bb8003db1
 
 com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage,2
+<<<<<<< HEAD
 fromData,58,2a2bb7007b2a2bb9007c0100b500052a2ab400052bb6007d2a2bb9007e0100b5000e2bb8007fb20080b600819b000d2a2bb900820100b5000ab1
 toData,104,2a2bb70086033d2a1cb600873d2b1cb9008802002ab4001099000d2b2ab40010b9008902002ab40008029f000d2b2ab40008b9008902002ab40006c6000b2ab400062bb8008a2b2ab4000eb9008902002bb8008bb20080b600819b000d2b2ab4000ab9008c0200b1
+=======
+fromData,58,2a2bb7007a2a2bb9007b0100b500052a2ab400052bb6007c2a2bb9007d0100b5000e2bb8007eb2007fb600809b000d2a2bb900810100b5000ab1
+toData,104,2a2bb70085033d2a1cb600863d2b1cb9008702002ab4001099000d2b2ab40010b9008802002ab40008029f000d2b2ab40008b9008802002ab40006c6000b2ab400062bb800892b2ab4000eb9008802002bb8008ab2007fb600809b000d2b2ab4000ab9008b0200b1
+>>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage,2
 fromData,17,2a2bb7003c2a2bb8003dc0003eb50003b1


Mime
View raw message