From f0503527548a13cd1af2db640488b4c01857fc4d Mon Sep 17 00:00:00 2001
From: shishir gowda <sgowda@redhat.com>
Date: Fri, 15 Nov 2013 14:53:44 +0530
Subject: snapshot: Merge conflict resolution

Signed-off-by: shishir gowda <sgowda@redhat.com>
---
 rpc/rpc-lib/src/protocol-common.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'rpc')

diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index 33bf2c541..e1a0b2c17 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,
 };
 
-- 
cgit