diff options
| author |   imarom <imarom@cisco.com> | 2015-08-30 11:41:42 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-08-30 11:41:42 +0300 |
| commit | c9381643e7bf9b3dc690bf3e012ad6176ee32b8c (patch) | |
| tree | ff0e91ee5c38f2caaeaa53340ecf2db2a326455a /scripts/automation/trex_control_plane/python_lib/lockfile-0.10.2/test-requirements.txt | |
| parent | 05a529031e962d61ab977393fb3d153931feff34 (diff) | |
| parent | 53f0e28d7f30c7175cbb15884c309613593859d8 (diff) | |
Merge branch 'master' into rpc
Conflicts:
linux/ws_main.py
linux_dpdk/ws_main.py
Diffstat (limited to 'scripts/automation/trex_control_plane/python_lib/lockfile-0.10.2/test-requirements.txt')
| -rwxr-xr-x | scripts/automation/trex_control_plane/python_lib/lockfile-0.10.2/test-requirements.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/automation/trex_control_plane/python_lib/lockfile-0.10.2/test-requirements.txt b/scripts/automation/trex_control_plane/python_lib/lockfile-0.10.2/test-requirements.txt deleted file mode 100755 index 2e087ff1..00000000 --- a/scripts/automation/trex_control_plane/python_lib/lockfile-0.10.2/test-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -nose -sphinx>=1.1.2,!=1.2.0,<1.3 |