X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-version.ac;h=a9cd45df9ead77b95b3346ca0a06b4ffaa83a885;hp=f4dc78d243b7f8c67c0bff65b1ec1519477ce8ed;hb=10e4a20a0800fdbe0a2dd047e0dcf307e71f1e7e;hpb=88e1d616bcad096753f557ee6104d3af15bba09f

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index f4dc78d..a9cd45d 100644
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,21 +1,15 @@
 m4_define([LUSTRE_MAJOR],[2])
-m4_define([LUSTRE_MINOR],[0])
+m4_define([LUSTRE_MINOR],[4])
 m4_define([LUSTRE_PATCH],[52])
 m4_define([LUSTRE_FIX],[0])
 
-dnl # don't forget to update the service tags info
-m4_define([CLIENT_URN],["LUSTRE-210-CLT"])
-m4_define([MDS_URN],["LUSTRE-210-MDS"])
-m4_define([MGS_URN],["LUSTRE-210-MGS"])
-m4_define([OSS_URN],["LUSTRE-210-OSS"])
-
 dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but
 dnl # after following release candidate/beta would spill this warning already.
-m4_define([LUSTRE_VER_ALLOWED_OFFSET],["OBD_OCD_VERSION(0,0,1,32)"])
-m4_define([LUSTRE_LIB_VER_OFFSET_WARN],["OBD_OCD_VERSION(0,0,1,32)"])
+m4_define([LUSTRE_VER_ALLOWED_OFFSET],["OBD_OCD_VERSION(0, 0, 1, 32)"])
+m4_define([LUSTRE_LIB_VER_OFFSET_WARN],["OBD_OCD_VERSION(0, 0, 1, 32)"])
 
-dnl # linux lustre delta is 0.2.0.0 , next major release version is ok
-m4_define([LUSTRE_CLI_VER_OFFSET_WARN],["OBD_OCD_VERSION(0,2,0,0)"])
+dnl # linux lustre delta is 0.4.0.0 , next stable release version is ok
+m4_define([LUSTRE_CLI_VER_OFFSET_WARN],["OBD_OCD_VERSION(0, 4, 0, 0)"])
 
 dnl # User editable part ends here. -----------------------------------------
 
@@ -30,10 +24,6 @@ m4_define([LUSTRE_VERSION],m4_if(LUSTRE_FIX,[0],LUSTRE_MAJOR.LUSTRE_MINOR.LUSTRE
 [AC_LUSTRE_VER_ALLOWED_OFFSET]=LUSTRE_VER_ALLOWED_OFFSET
 [AC_LUSTRE_LIB_VER_OFFSET_WARN]=LUSTRE_LIB_VER_OFFSET_WARN
 [AC_LUSTRE_CLI_VER_OFFSET_WARN]=LUSTRE_CLI_VER_OFFSET_WARN
-[AC_LUSTRE_CLIENT_URN]=CLIENT_URN
-[AC_LUSTRE_MGS_URN]=MGS_URN
-[AC_LUSTRE_MDS_URN]=MDS_URN
-[AC_LUSTRE_OSS_URN]=OSS_URN
 
 AC_SUBST([AC_LUSTRE_MAJOR])
 AC_SUBST([AC_LUSTRE_MINOR])
@@ -43,7 +33,3 @@ AC_SUBST([AC_LUSTRE_VERSION_STRING])
 AC_SUBST([AC_LUSTRE_VER_ALLOWED_OFFSET])
 AC_SUBST([AC_LUSTRE_LIB_VER_OFFSET_WARN])
 AC_SUBST([AC_LUSTRE_CLI_VER_OFFSET_WARN])
-AC_SUBST([AC_LUSTRE_CLIENT_URN])
-AC_SUBST([AC_LUSTRE_MDS_URN])
-AC_SUBST([AC_LUSTRE_MGS_URN])
-AC_SUBST([AC_LUSTRE_OSS_URN])