summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorshishir gowda <sgowda@redhat.com>2013-11-15 14:53:44 +0530
committershishir gowda <sgowda@redhat.com>2013-11-15 14:53:44 +0530
commitf0503527548a13cd1af2db640488b4c01857fc4d (patch)
treef8dcccb2d0d824ba1b81c5bb4b293359a10b6d56 /rpc
parent6acf65e64cb6cd50b05ef8e60769ab3d5dc32ef7 (diff)
snapshot: Merge conflict resolution
Signed-off-by: shishir gowda <sgowda@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-lib/src/protocol-common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index 33bf2c5..e1a0b2c 100644
--- a/rpc/rpc-lib/src/protocol-common.h
+++ b/rpc/rpc-lib/src/protocol-common.h
@@ -192,6 +192,7 @@ enum glusterd_brick_procnum {
GLUSTERD_BRICK_XLATOR_DEFRAG,
GLUSTERD_NODE_PROFILE,
GLUSTERD_NODE_STATUS,
+ GLUSTERD_VOLUME_BARRIER_OP,
GLUSTERD_BRICK_MAXVALUE,
};