[SCM] Samba Website Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  031a630 Make 'patch' happy.
      from  98e67d9 Add missing description for bug #7715.

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 031a6307e7585c7144f4a61b5edc5d037b1f9137
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Oct 7 18:12:38 2010 +0200

    Make 'patch' happy.
    
    Thanks for the hint, Volker!
    
    Karolin

-----------------------------------------------------------------------

Summary of changes:
 ...ing-the-write-cache-after-an-oplock-break.patch |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/patches/patches-3.3.14/0001-s3-Stop-using-the-write-cache-after-an-oplock-break.patch b/patches/patches-3.3.14/0001-s3-Stop-using-the-write-cache-after-an-oplock-break.patch
index c1fc0c2..abae270 100644
--- a/patches/patches-3.3.14/0001-s3-Stop-using-the-write-cache-after-an-oplock-break.patch
+++ b/patches/patches-3.3.14/0001-s3-Stop-using-the-write-cache-after-an-oplock-break.patch
@@ -1,17 +1,17 @@
-From adba466498a1dc6e0cda158f98b501bba7b6736b Mon Sep 17 00:00:00 2001
+From 629c6f96c5872f17346f1562d5dc995049adac51 Mon Sep 17 00:00:00 2001
 From: Volker Lendecke <vl at samba.org>
 Date: Sat, 2 Oct 2010 17:07:00 +0200
 Subject: [PATCH] s3: Stop using the write cache after an oplock break
 
 ---
- source3/smbd/oplock.c |    1 +
+ source/smbd/oplock.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
-index cdb6093..ff5f6ad 100644
---- a/source3/smbd/oplock.c
-+++ b/source3/smbd/oplock.c
-@@ -118,6 +118,7 @@ void release_file_oplock(files_struct *fsp)
+diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c
+index a07d05d..5f922e1 100644
+--- a/source/smbd/oplock.c
++++ b/source/smbd/oplock.c
+@@ -158,6 +158,7 @@ void release_file_oplock(files_struct *fsp)
  	fsp->sent_oplock_break = NO_BREAK_SENT;
  
  	flush_write_cache(fsp, OPLOCK_RELEASE_FLUSH);


-- 
Samba Website Repository