git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50d76a3 ec63d1e)
Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 24 Apr 2015 10:25:28 +0000 (12:25 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 24 Apr 2015 10:25:28 +0000 (12:25 +0200)
* 'master' of ssh://git.onelab.eu/git/build:
  Setting tag sfa-3.1-15 major rework of the iotlab driver, that uses an IoT-lab REST API and so does not need to interact with LDAP and OAR directly deprecated cortexlab driver altogether cosmetic changes in displaying credentials, rights and certificates for hopefully more readable error messages always start postgresql if not running (ignore /etc/myplc-release) does not need lxc=enter-namespace anymore for make sync

1  2 
lxc-tags.mk patch | diff1 | diff2 | blob | history
onelab-tags.mk patch | diff1 | diff2 | blob | history

diff --cc lxc-tags.mk
Simple merge
diff --cc onelab-tags.mk
Simple merge
build