diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-02-11 14:02:43 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-02-11 14:02:43 +0000 |
| commit | 0d92798e88c5444fb2cc23663b4ea9a345887756 (patch) | |
| tree | a71f336115753242e8690547f403405a3373ddf1 /libglusterfs/src/globals.h | |
| parent | 33939dcde38389373e7ed8b12c6e9916b39411d0 (diff) | |
| parent | 408d50a64b7b3a9d6a4899060baa423ff126cc5f (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
xlators/mgmt/glusterd/src/Makefile.am
Change-Id: Ida5ec4aecc358cb2268bdfdb1a8c9bab750f9575
Diffstat (limited to 'libglusterfs/src/globals.h')
| -rw-r--r-- | libglusterfs/src/globals.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h index 3085db21c..16ab96268 100644 --- a/libglusterfs/src/globals.h +++ b/libglusterfs/src/globals.h @@ -21,16 +21,18 @@ * * 3.3.0 - 1 * 3.4.0 - 2 - * 3.next (3.5?) - 3 + * 3.5.0 - 3 + * 3.next (3.6?) - 4 * * TODO: Change above comment once gluster version is finalised * TODO: Finalize the op-version ranges */ #define GD_OP_VERSION_MIN 1 /* MIN is the fresh start op-version, mostly should not change */ -#define GD_OP_VERSION_MAX 3 /* MAX VERSION is the maximum count in VME table, +#define GD_OP_VERSION_MAX 4 /* MAX VERSION is the maximum count in VME table, should keep changing with introduction of newer versions */ +#define GD_OP_VERSION_4 4 /* Op-Version 4 */ #include "xlator.h" |