[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  9f71b96 Fix a typo in the name of the default domain level
      from  4e1cc54 s3:tevent_wait: simplify the code by using tevent_req_defer_callback()

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


- Log -----------------------------------------------------------------
commit 9f71b96ba0068ddc613b925cd1be6885a696e443
Author: Matthieu Patou <mat at matws.net>
Date:   Tue May 19 03:39:59 2015 -0700

    Fix a typo in the name of the default domain level
    
    Change-Id: I2df44546a74f19ef2c6f1100d29b67fe7362070a
    Signed-off-by: Matthieu Patou <mat at matws.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue May 19 19:26:22 CEST 2015 on sn-devel-104

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

Summary of changes:
 python/samba/netcmd/domain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 07a0460..f8e32f0 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -205,7 +205,7 @@ class cmd_domain_provision(Command):
                 default="domain controller"),
          Option("--function-level", type="choice", metavar="FOR-FUN-LEVEL",
                 choices=["2000", "2003", "2008", "2008_R2"],
-                help="The domain and forest function level (2000 | 2003 | 2008 | 2008_R2 - always native). Default is (Windows) 2008R2 Native.",
+                help="The domain and forest function level (2000 | 2003 | 2008 | 2008_R2 - always native). Default is (Windows) 2008_R2 Native.",
                 default="2008_R2"),
          Option("--next-rid", type="int", metavar="NEXTRID", default=1000,
                 help="The initial nextRid value (only needed for upgrades).  Default is 1000."),


-- 
Samba Shared Repository