X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-version.ac;h=a5280d64e5f2cb6f237068ebdcb6c126f5292246;hb=ab8b977f77e44c3f4d57be2244e9df898fd15316;hp=2f38b58fa1861bf814cb1055cfc57c51f089f914;hpb=c14959687ffbcaa1d539b7cd1bc344eba88c5f17;p=fs%2Flustre-release.git

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index 2f38b58..a5280d6 100644
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,15 +1,14 @@
 m4_define([LUSTRE_MAJOR],[2])
-m4_define([LUSTRE_MINOR],[1])
-m4_define([LUSTRE_PATCH],[54])
+m4_define([LUSTRE_MINOR],[7])
+m4_define([LUSTRE_PATCH],[60])
 m4_define([LUSTRE_FIX],[0])
 
 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)"])
 
-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, 50, 0)"])
 
 dnl # User editable part ends here. -----------------------------------------
 
@@ -22,7 +21,6 @@ m4_define([LUSTRE_VERSION],m4_if(LUSTRE_FIX,[0],LUSTRE_MAJOR.LUSTRE_MINOR.LUSTRE
 [AC_LUSTRE_FIX]=LUSTRE_FIX
 [AC_LUSTRE_VERSION_STRING]=LUSTRE_VERSION
 [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_SUBST([AC_LUSTRE_MAJOR])
@@ -31,5 +29,4 @@ AC_SUBST([AC_LUSTRE_PATCH])
 AC_SUBST([AC_LUSTRE_FIX])
 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])