[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  bd7dec2 selftet: fix the flapping entry for the drs.delete_object test.
       via  2d17444 selftest: fix the flapping entry for the tombstone reanimation test
      from  74ff89a torture/ioctl: add simple FSCTL_FILE_LEVEL_TRIM test

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bd7dec2d7263dab7325750fd5d9991fb267a0b5a
Author: Michael Adam <obnox at samba.org>
Date:   Wed Mar 18 17:41:42 2015 +0100

    selftet: fix the flapping entry for the drs.delete_object test.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Thu Mar 19 00:09:23 CET 2015 on sn-devel-104

commit 2d17444a3219f6e66fd641b88aaaf1e8d18616d0
Author: Michael Adam <obnox at samba.org>
Date:   Wed Mar 18 17:41:11 2015 +0100

    selftest: fix the flapping entry for the tombstone reanimation test
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 selftest/flapping | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/flapping b/selftest/flapping
index 17f5048..0195487 100644
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -25,5 +25,5 @@
 ^samba3.raw.acls.inheritance\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
 ^samba3.raw.samba3checkfsp.samba3checkfsp\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
 ^samba3.raw.samba3closeerr.samba3closeerr\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
-^samba4.tombstone_reanimation.python.tombstone_reanimation.RestoreContainerObjectTestCase.test_container # flakey on sn-devel
-^samba4.drs.delete_object.python.*.delete_object.DrsDeleteObjectTestCase.test_ReplicateDeletedObject1 # flakey on sn-devel
+^samba4.tombstone_reanimation.python # flakey on sn-devel
+^samba4.drs.delete_object.python # flakey on sn-devel


-- 
Samba Shared Repository