[SCM] Samba Shared Repository - branch master updated

[Tim Beale]

The branch, master has been updated
       via  4729c90f974 traffic: rm --scale-traffic default value
      from  36c42e6d629 libcli: dns: Change internal DNS_REQUEST_TIMEOUT from 2 to 10 seconds.

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


- Log -----------------------------------------------------------------
commit 4729c90f974bf6b11d9164cdcd819e6238eea08a
Author: Joe Guo <joeg at catalyst.net.nz>
Date:   Tue Jan 15 11:06:29 2019 +1300

    traffic: rm --scale-traffic default value
    
    -S, --scale--traffic defaults to 1.0
    when we switch to new option -T, both -T and -S are set, which raise an error:
    
    script/traffic_replay #234: --scale-traffic and --packets-per-second are incompatible. Use one or the other.
    
    Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Tim Beale <timbeale at catalyst.net.nz>
    
    Autobuild-User(master): Tim Beale <timbeale at samba.org>
    Autobuild-Date(master): Wed Jan 23 03:09:41 CET 2019 on sn-devel-144

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

Summary of changes:
 script/traffic_replay | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/script/traffic_replay b/script/traffic_replay
index 7174d246d3b..fab9a8ded26 100755
--- a/script/traffic_replay
+++ b/script/traffic_replay
@@ -78,7 +78,7 @@ def main():
     model_group = optparse.OptionGroup(parser, 'Traffic Model Options',
                                        'These options alter the traffic '
                                        'generated by the model')
-    model_group.add_option('-S', '--scale-traffic', type='float', default=1.0,
+    model_group.add_option('-S', '--scale-traffic', type='float',
                            help=('Increase the number of conversations by '
                                  'this factor (or use -T)'))
     parser.add_option('-T', '--packets-per-second', type=float,


-- 
Samba Shared Repository