summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/client/trex_client.py
diff options
context:
space:
mode:
authorDan Klein <danklei@cisco.com>2015-10-12 09:11:44 +0300
committerDan Klein <danklei@cisco.com>2015-10-12 09:11:44 +0300
commitbd640666c052a1c770c9c1758c809f68d99af010 (patch)
tree7943dc2bfb2eaf20240189a61e23f326e1d5e8ac /scripts/automation/trex_control_plane/client/trex_client.py
parent47111637f4989f82fb8ed2dab6240efb5b12713f (diff)
solving conflicts
Diffstat (limited to 'scripts/automation/trex_control_plane/client/trex_client.py')
-rwxr-xr-xscripts/automation/trex_control_plane/client/trex_client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/automation/trex_control_plane/client/trex_client.py b/scripts/automation/trex_control_plane/client/trex_client.py
index 607251fe..c3677132 100755
--- a/scripts/automation/trex_control_plane/client/trex_client.py
+++ b/scripts/automation/trex_control_plane/client/trex_client.py
@@ -805,7 +805,7 @@ class CTRexResult(object):
def is_valid_hist (self):
"""
- Checks if result object contains valid data.
+ Checks if result obejct contains valid data.
:parameters:
None
@@ -819,7 +819,7 @@ class CTRexResult(object):
def set_valid_hist (self, valid_stat = True):
"""
- Sets result object validity status.
+ Sets result obejct validity status.
:parameters:
valid_stat : bool