From: Oleg Drokin <oleg.drokin@intel.com>
Date: Fri, 15 Aug 2014 22:17:13 +0000 (-0400)
Subject: New tag 2.6.51
X-Git-Tag: 2.6.51^0
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=26bc216c8a25db00c4cf3e23bd6cf175610963ea

New tag 2.6.51

Change-Id: I45f7812fd7e4d061f2605579c8bac4671a24e202
---

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index a20bb8d..71d6633 100644
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,6 +1,6 @@
 m4_define([LUSTRE_MAJOR],[2])
 m4_define([LUSTRE_MINOR],[6])
-m4_define([LUSTRE_PATCH],[50])
+m4_define([LUSTRE_PATCH],[51])
 m4_define([LUSTRE_FIX],[0])
 
 dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but
diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index de54f75..cc7e67d 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1072,7 +1072,7 @@ dont_check_exports:
         if (rc)
                 GOTO(out, rc);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 51, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 52, 0)
 	/* 2.2.0 clients always swab nidtbl entries due to a bug, so server
 	 * will do the swabbing for if the client is using the same endianness.
 	 *
diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index d0b7708..8a307dd 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -843,7 +843,7 @@ static int ll_options(char *options, int *flags)
                         *flags &= ~tmp;
                         goto next;
                 }
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 51, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 52, 0)
 		tmp = ll_set_opt("acl", s1, LL_SBI_ACL);
 		if (tmp) {
 			/* Ignore deprecated mount option.  The client will