commit 5a7048eee60499af6f5e452447f3a8fc288a5c11
author Umesh Krishnaswamy <krishji@gmail.com> Sat Apr 06 00:42:19 2013 -0700
committer Umesh Krishnaswamy <krishji@gmail.com> Sat Apr 06 00:42:19 2013 -0700
tree d2da59718db0131874aa16473f6c90f775403b31
parent 5c3eddf031d22ed7bcf7b9c5c949e6b4cf04233e
parent e7fa10fc99c0f6f6c0f800d73c53b99695e7e43e

Merge branch 'master' into ons-rel-rc3

Conflicts:
	scripts/iperf

scripts/iperf

diff --git a/scripts/iperf b/scripts/iperf
index 2a71eec..9f76801 100755
--- a/scripts/iperf
+++ b/scripts/iperf
Binary files differ

web/preset_flow.sh

diff --git a/web/preset_flow.sh b/web/preset_flow.sh
index 7eade00..696c94c 100755
--- a/web/preset_flow.sh
+++ b/web/preset_flow.sh
@@ -1,11 +1,11 @@
 #! /bin/bash
 Cluster=4
-for n in 8 25; do 
+for n in 8 24; do 
    let nr_flows=\($Cluster-1\)*\($Cluster-2\)*$n
    ./preset_flow.py $Cluster $n > flowdef_${Cluster}node_$nr_flows.txt
 done
 Cluster=8
-for n in 1 3 6 10 25; do 
+for n in 1 3 6 10 24; do 
    let nr_flows=\($Cluster-1\)*\($Cluster-2\)*$n
    ./preset_flow.py $Cluster $n > flowdef_${Cluster}node_$nr_flows.txt
 done