[SCM] Samba Website Repository - branch master updated

[Marc Muehlfeld]

Am 18.09.2015 um 21:52 schrieb Andrew Bartlett:
>>  patches/patches     | 1 -
>>  patches/series      | 2 +-
>>  3 files changed, 2 insertions(+), 3 deletions(-)
>>  delete mode 120000 patches/patches
>>  mode change 120000 => 100644 patches/series
> 
> What are these changes to patches/ about?
> 
>> diff --git a/patches/patches b/patches/patches
>> deleted file mode 120000
>> index 7ba4428..0000000
>> --- a/patches/patches
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -patches-3.3.14
>> \ No newline at end of file
>> diff --git a/patches/series b/patches/series
>> deleted file mode 120000
>> index 3513e95..0000000
>> --- a/patches/series
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -patches-3.3.14/series
>> \ No newline at end of file
>> diff --git a/patches/series b/patches/series
>> new file mode 100644
>> index 0000000..404472c
>> --- /dev/null
>> +++ b/patches/series
>> @@ -0,0 +1 @@
>> +0001-s3-Stop-using-the-write-cache-after-an-oplock-break.patch

I'm sorry. It seems there was a bit more in that commit than that small
change and I have no idea how this happened.

The attached patch should return the two symlinks in the patches folder
and keep my change in download/index.html untouched. Please review and
push, if OK. Thanks.


Regards,
Marc
-------------- next part --------------
From 2d97797d206fe21aabb33a4bf901dcc548637b12 Mon Sep 17 00:00:00 2001
From: Marc Muehlfeld <mmuehlfeld at samba.org>
Date: Sun, 20 Sep 2015 14:11:55 +0200
Subject: [PATCH] Revert two accidentally removed symlinks

In commit a478eabf6d129182071901b3bcd88a2ce0b1de00 I accidentally removed
one symlink and turned another one into a regular file. This patch reverts
those changes.

Signed-off-by: Marc Muehlfeld <mmuehlfeld at samba.org>
---
 patches/patches | 1 +
 patches/series  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 patches/patches
 mode change 100644 => 120000 patches/series

diff --git a/patches/patches b/patches/patches
new file mode 120000
index 0000000..7ba4428
--- /dev/null
+++ b/patches/patches
@@ -0,0 +1 @@
+patches-3.3.14
\ No newline at end of file
diff --git a/patches/series b/patches/series
deleted file mode 100644
index 404472c..0000000
--- a/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-s3-Stop-using-the-write-cache-after-an-oplock-break.patch
diff --git a/patches/series b/patches/series
new file mode 120000
index 0000000..3513e95
--- /dev/null
+++ b/patches/series
@@ -0,0 +1 @@
+patches-3.3.14/series
\ No newline at end of file
-- 
2.4.3