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/mem-types.h | |
| parent | 6acf65e64cb6cd50b05ef8e60769ab3d5dc32ef7 (diff) | |
snapshot: Merge conflict resolution
Signed-off-by: shishir gowda <sgowda@redhat.com>
Diffstat (limited to 'libglusterfs/src/mem-types.h')
| -rw-r--r-- | libglusterfs/src/mem-types.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libglusterfs/src/mem-types.h b/libglusterfs/src/mem-types.h index 9aadbcaec..f5dc6f29f 100644 --- a/libglusterfs/src/mem-types.h +++ b/libglusterfs/src/mem-types.h @@ -117,6 +117,9 @@ enum gf_common_mem_types_ { gf_common_mt_locker = 101, gf_common_mt_auxgids = 102, gf_common_mt_syncopctx = 103, - gf_common_mt_end = 104 + gf_common_mt_uuid_t = 104, + gf_common_mt_vol_lock_obj_t = 105, + gf_common_mt_txn_opinfo_obj_t = 106, + gf_common_mt_end = 107 }; #endif |