[SCM] Samba Shared Repository - branch master updated

[Douglas Bagnall]

The branch, master has been updated
       via  3c103f9 netcmd/domain: improve error message grammar
       via  23765e5 vlv tests: remove uninteresting debug message
       via  9ea6d12 Remove hopelessly out of date Roadmap
      from  be099e4 winbindd: Introduce helper function for winbindd_cache.tdb directory

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


- Log -----------------------------------------------------------------
commit 3c103f9b1a119da3b66ceaa231942d4e81e3f61d
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Thu May 12 11:38:09 2016 +1200

    netcmd/domain: improve error message grammar
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    
    Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
    Autobuild-Date(master): Fri Aug 19 17:30:39 CEST 2016 on sn-devel-144

commit 23765e54e0511645a801fd94ead7a742528bcbaa
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Wed Aug 3 16:04:30 2016 +1200

    vlv tests: remove uninteresting debug message
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

commit 9ea6d1293f6f540525fb587d159b6fc675e17d59
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Tue Aug 16 11:48:02 2016 +1200

    Remove hopelessly out of date Roadmap
    
    Nobody has noticed, so it shouldn't be missed.
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 Roadmap                          | 24 ------------------------
 python/samba/netcmd/domain.py    |  4 ++--
 source4/dsdb/tests/python/vlv.py |  2 --
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 Roadmap


Changeset truncated at 500 lines:

diff --git a/Roadmap b/Roadmap
deleted file mode 100644
index 96b8052..0000000
--- a/Roadmap
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (C) 1997-2015 Samba-Team
-
-The Samba-Team are committed to an aggressive program to deliver quality
-controlled software to a well defined roadmap.
-
-Please also look at the Release planning pages of wiki.samba.org for more
-information.
-
-The following development objectives for future releases
-are in progress:
-----------------------------------------------------------------------------
-Samba-4.0.x		This release turned into security maintenance mode
-			since we released 4.2.
-
-Samba-4.1.x		Our previous release including the AD domain
-			controller feature, the file server and other
-			functionality from Samba 4.0.
-
-Samba-4.2.x		Our current release.
-
-
-Note that it is a given that the Samba-Team will continue to track
-Windows releases, ensuring that Samba will work
-well with whatever releases Redmond throws our way :-).
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index fd26d93..d92820a 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -419,7 +419,7 @@ class cmd_domain_provision(Command):
                                           "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")
                     eadb = False
                 except Exception:
-                    self.logger.info("You are not root or your system do not support xattr, using tdb backend for attributes. ")
+                    self.logger.info("You are not root or your system does not support xattr, using tdb backend for attributes. ")
             finally:
                 file.close()
 
@@ -1530,7 +1530,7 @@ class cmd_domain_classicupgrade(Command):
                     eadb = False
                 except Exception:
                     # FIXME: Don't catch all exceptions here
-                    logger.info("You are not root or your system do not support xattr, using tdb backend for attributes. "
+                    logger.info("You are not root or your system does not support xattr, using tdb backend for attributes. "
                                 "If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.")
             finally:
                 tmpfile.close()
diff --git a/source4/dsdb/tests/python/vlv.py b/source4/dsdb/tests/python/vlv.py
index 0697319..9fe453d 100644
--- a/source4/dsdb/tests/python/vlv.py
+++ b/source4/dsdb/tests/python/vlv.py
@@ -773,7 +773,6 @@ class VLVTests(samba.tests.TestCase):
         searching in the entire tree, not just our OU. This is the
         way to find deleted objects.
         """
-        t = time.time()
         if base is None:
             base = self.base_dn
         sort_control = "server_sort:1:0:%s" % attr
@@ -785,7 +784,6 @@ class VLVTests(samba.tests.TestCase):
                               attrs=[attr],
                               controls=controls)
         results = [x[attr][0] for x in res]
-        print "get_expected_order_showing_deleted took %.1f" % (time.time() - t)
         return results
 
     def add_deleted_users(self, n):


-- 
Samba Shared Repository