From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 30 Oct 2014 08:58:39 +0000 (+0100)
Subject: Merge branch 'ipv6'
X-Git-Tag: nodemanager-5.2-15~3
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=ecee05390277f57b02d21ffca0195292bde1defa

Merge branch 'ipv6'

only one minor conflict found in a comment in Makefile
---

ecee05390277f57b02d21ffca0195292bde1defa
diff --cc Makefile
index 824138e,2a073d3..5221fa8
--- a/Makefile
+++ b/Makefile
@@@ -135,7 -135,7 +135,7 @@@ NODEURL:=root@$(NODE):
  endif
  
  # this is for lxc only, we need to exclude the vs stuff that otherwise messes up everything on node
- # xxx keep this in sync with setup.spec
 -# keep this in sync with setup.spec
++# WARNING: keep this in sync with setup.spec
  LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py --exclude drl.py
  
  # run with make SYNC_RESTART=false if you want to skip restarting nm