Merge branch 'master' into wip v0.3.0-rc1
authorSebastien Douheret <sebastien.douheret@iot.bzh>
Fri, 20 Oct 2017 12:30:33 +0000 (14:30 +0200)
committerSebastien Douheret <sebastien.douheret@iot.bzh>
Fri, 20 Oct 2017 12:36:43 +0000 (14:36 +0200)
commit2d90eac319979dba64371258b30e61e77a15db7d
tree3b89b5efcf4b4476852a9944a12d5c9a6e3502fd
parent77ab312b87324090ec6cb619d11f792b53fdddbd
parent7843cfd903cf7770df81c91193068900fb563e59
Merge branch 'master' into wip

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Makefile
conf.d/etc/xds-agent/config.json
lib/syncthing/st.go
lib/xdsconfig/configfile.go
scripts/install.sh