Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

diff --combined planetlab/exp-tool/Makefile
index 719da01,c4ee1c3..54946d4
--- 1/planetlab/exp-tool/Makefile
--- 2/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@@ -33,7 -33,7 +33,7 @@@ els
  SSH_KEY_OPTION ?= -i $(SSH_KEY)
  endif
  
 -SSH_OPTIONS ?= $(SSH_KEY_OPTION) -l $(SLICE)
 +SSH_OPTIONS ?= $(SSH_KEY_OPTION) -l $(SLICE) -t
  SSH = ssh $(SSH_OPTIONS)
  
  ALL_NODE_IDS=$(shell (cut -d- -f1 < links; cut -d- -f2 < links) | sort -u)
@@@ -54,7 -54,7 +54,7 @@@ all: $(addprefix L/,$(shell cat links)
  .PHONY: all
  
  nodes:
-       @echo $(foreach id,$(ALL_NODE_IDS),$(call display,$(id)))
+       @$(foreach id,$(ALL_NODE_IDS),echo $(id)=$(call display,$(id));)
  .PHONY: nodes
  
  sshchecks: $(foreach id,$(ALL_NODE_IDS),cache/sshcheck.$(id))
@@@ -72,7 -72,6 +72,7 @@@ cache/host.%
        @host $(HOST_$*) | sed -n 's/^.*has address *//p' > $@
  
  cache/db.%:
 +<<<<<<< HEAD
        @echo "Starting db server on $(call display,$*)"
        @$(SSH) $(HOST_$*) sudo start_ovsdb-server > $@ \
         || { rm $@; exit 1; }