Commit 75c0373a authored by chiaming2000's avatar chiaming2000
Browse files

Sync kinetic protocol to version 2.0.4 for Java API and simulator. This 

commit makes the "protocol compatibility" up to date and eliminates the
possibility for HMAC errors.

The API and logic to get/set "allChildOperationsSucceeded" field for P2P
operation will follow shortly.
parent 34164625

bin/syncProtoFromRepo.sh

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ BASE_DIR=`cd "$BASE_DIR"; pwd` 
PROTO_REPO_URL=https://github.com/Seagate/Kinetic-Protocol.git

PROTO_FILE=$BASE_DIR/kinetic-common/src/main/java/com/seagate/kinetic/proto/kinetic.proto

CLONE_DIR=$BASE_DIR/bin/Kinetic-Protocol

PROTO_RELEASE_VERSION=2.0.3

PROTO_RELEASE_VERSION=2.0.4



function syncFromProtoRepo(){

    if [ -d "$CLONE_DIR" ]; then

kinetic-client/src/main/java/kinetic/client/ClientConfiguration.java

+2 −2
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ public class ClientConfiguration extends Properties { 
	 /**

     * current supported kinetic protocol version on kinetic-protocol repo.

     */

    public static final String PROTOCOL_VERSION = "2.0.3";

    public static final String PROTOCOL_VERSION = "2.0.4";

    

    /**

     * current supported protocol source commit hash on kinetic-protocol repo.

     */

    public static final String PROTOCOL_SOURCE_HASH = "389e63f814cc0b5d699104c08854b5b9c1abab38";

    public static final String PROTOCOL_SOURCE_HASH = "337cdcef1c9d64b3cbfa7079fb304b5459bc335f";



	// kinetic server host

	private String host = "localhost";

kinetic-simulator/src/main/java/kinetic/simulator/SimulatorConfiguration.java

+2 −2
Original line number Diff line number Diff line
@@ -201,12 +201,12 @@ public class SimulatorConfiguration extends Properties { 
    /**

     * current supported protocol version defined at kinetic-protocol repository.

     */

    public static final String PROTOCOL_VERSION = "2.0.3";

    public static final String PROTOCOL_VERSION = "2.0.4";

    

    /**

     * current supported protocol source commit hash value obtained from kinetic-protocol repository.

     */

    public static final String PROTOCOL_SOURCE_HASH = "389e63f814cc0b5d699104c08854b5b9c1abab38";

    public static final String PROTOCOL_SOURCE_HASH = "337cdcef1c9d64b3cbfa7079fb304b5459bc335f";

    

    /**

     * heart beat provider.