summaryrefslogtreecommitdiffstats
path: root/benchmarks/playbooks/whetstone.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'benchmarks/playbooks/whetstone.yaml')
-rw-r--r--benchmarks/playbooks/whetstone.yaml3
1 files changed, 0 insertions, 3 deletions
diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml
index 71063815..c22ea433 100644
--- a/benchmarks/playbooks/whetstone.yaml
+++ b/benchmarks/playbooks/whetstone.yaml
@@ -20,11 +20,8 @@
- name: make directory
shell: mkdir $HOME/qtip_result
- include: ./sys_info_pbook.yaml
-<<<<<<< HEAD
vars:
network: false
-=======
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
- name: Installing UnixBench dependencies if CentOS
shell: yum install git gcc patch perl-Time-HiRes -y
when: ansible_os_family == "RedHat"