From a26176775743f16e4a9fe51704de0f613c13ed49 Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Thu, 25 Sep 2008 01:37:27 +0000
Subject: [PATCH] Branch b1_8_gate b=16929 o=adilger i=johann i=tom.wang
 (wangdi)

Disable file join on production releases.
---
 lustre/ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 46ad59f..108c9ad 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -37,6 +37,7 @@ tbd Sun Microsystems, Inc.
 	  For more information, please refer to bugzilla 13904.
 	* Output of lfs quota has been made less detailed by default,
 	  old (verbose) output can be obtained by using -v option.
+	* File join has been disabled in this release, refer to Bugzilla 16929.
 
 Severity   : enhancement
 Bugzilla   : 15966
-- 
1.8.3.1