From: Oleg Drokin <oleg.drokin@intel.com>
Date: Fri, 11 Jul 2014 03:28:40 +0000 (-0400)
Subject: New tag 2.6.50
X-Git-Tag: 2.6.50^0
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0ae652a50efcde81d4bbdc21433cf3ceeb7f80d9

New tag 2.6.50

After split off of b2_6 off master, beginning of 2.7.0 development

Change-Id: If88e685f9fe7d7f720ccf5d1df493efd1026d7dc
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 76f9789..812d33b 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,4 +1,25 @@
 TBD Intel Corporation
+       * version 2.7.0
+       * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
+         for currently supported client and server kernel versions.
+       * Server known to build on patched kernels:
+         2.6.32-431.20.3.el6 (RHEL6.5)
+         3.0.101-0.31        (SLES11 SP3)
+       * Client known to build on unpatched kernels:
+         2.6.32-431.20.3.el6 (RHEL6.5)
+         3.0.101-0.31        (SLES11 SP3)
+         3.6.10-4.fc18       (FC18)
+         3.10                (kernel.org)
+       * Recommended e2fsprogs version: 1.42.9.wc1 or newer
+       * NFS export disabled when stack size < 8192 (32-bit Lustre clients),
+         since the NFSv4 export of Lustre filesystem with 4K stack may cause a
+         stack overflow. For more information, please refer to bugzilla 17630.
+       * NFSv4 reexport to 32-bit NFS client nodes requires Lustre client on
+         the re-exporting nodes to be mounted with "32bitapi" mount option
+
+--------------------------------------------------------------------------------
+
+07-30-2014 Intel Corporation
        * version 2.6.0
        * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
          for currently supported client and server kernel versions.
diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index 48d1cac..a20bb8d 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],[5])
-m4_define([LUSTRE_PATCH],[60])
+m4_define([LUSTRE_MINOR],[6])
+m4_define([LUSTRE_PATCH],[50])
 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 c6bedd1..de54f75 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, 50, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 51, 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/utils/lustre_cfg.c b/lustre/utils/lustre_cfg.c
index 18df7d8..c5a2379 100644
--- a/lustre/utils/lustre_cfg.c
+++ b/lustre/utils/lustre_cfg.c
@@ -767,7 +767,7 @@ static void lprocfs_param_pattern(const char *cmd, const char *path, char *buf,
                 if (!warned) {
                         fprintf(stderr, "%s: specifying parameters via "
                                 "full paths is deprecated.\n", cmd);
-#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 50, 0)
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 51, 0)
 #warning "remove deprecated full path tunable access"
 #endif
                         warned = 1;