diff options
| author | shishir gowda <sgowda@redhat.com> | 2013-11-15 14:53:44 +0530 |
|---|---|---|
| committer | shishir gowda <sgowda@redhat.com> | 2013-11-15 14:53:44 +0530 |
| commit | f0503527548a13cd1af2db640488b4c01857fc4d (patch) | |
| tree | f8dcccb2d0d824ba1b81c5bb4b293359a10b6d56 /libglusterfs/src/glusterfs.h | |
| parent | 6acf65e64cb6cd50b05ef8e60769ab3d5dc32ef7 (diff) | |
snapshot: Merge conflict resolution
Signed-off-by: shishir gowda <sgowda@redhat.com>
Diffstat (limited to 'libglusterfs/src/glusterfs.h')
| -rw-r--r-- | libglusterfs/src/glusterfs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index a2fd48db5..98f512522 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -460,6 +460,7 @@ typedef enum { GF_EVENT_AUTH_FAILED, GF_EVENT_VOLUME_DEFRAG, GF_EVENT_PARENT_DOWN, + GF_EVENT_VOLUME_BARRIER_OP, GF_EVENT_MAXVAL, } glusterfs_event_t; |