resolve conflicts

Signed-off-by: Ryan Leung <[email protected]>

pkg/keyspace/util.go

@@ -131,15 +131,6 @@ func validateName(name string) error {
 	return nil
 }
 
-// keyspaceIDHash is used to hash the spaceID inside the lockGroup.
-// A simple mask is applied to spaceID to use its last byte as map key,
-// limiting the maximum map length to 256.
-// Since keyspaceID is sequentially allocated, this can also reduce the chance
-// of collision when comparing with random hashes.
-func keyspaceIDHash(id uint32) uint32 {
-	return id & 0xFF
-}
-
 // makeKeyRanges encodes keyspace ID to correct LabelRule data.
 // For a keyspace with id ['a', 'b', 'c'], it has four boundaries:
 //

pkg/mcs/discovery/registry_entry.go

@@ -23,7 +23,7 @@ import (
 
 // ServiceRegistryEntry is the registry entry of a service
 type ServiceRegistryEntry struct {
-	ServiceAddr string `json:"serviceAddr"`
+	ServiceAddr string `json:"service-addr"`
 }
 
 // Serialize this service registry entry