From: Thierry Parmentelat Date: Fri, 24 Apr 2015 10:25:28 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.3.9~45 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=acdec601f93d93020392ed0d989e7ff48a067c00;hp=-c;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build * '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 --- acdec601f93d93020392ed0d989e7ff48a067c00 diff --combined lxc-tags.mk index 94da9422,f2dfb7e4..7a551785 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@@ -24,7 -24,7 +24,7 @@@ vsys-GITPATH := git://git.onelab.eu/v vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-50 bind_public-GITPATH := git://git.onelab.eu/bind_public.git@bind_public-0.1-2 sliver-openvswitch-GITPATH := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-2.2.90-1 -plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.3-7 +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master drupal-GITPATH := git://git.onelab.eu/drupal.git@drupal-4.7-15 plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-5.2-5 www-register-wizard-GITPATH := git://git.onelab.eu/www-register-wizard.git@www-register-wizard-4.3-5 @@@ -42,12 -42,12 +42,12 @@@ pcucontrol-GITPATH := git: # omf-resctl now comes from yum and gem, no need for rvm-ruby anymore oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### -bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.2-5 +bootcd-GITPATH := git://git.onelab.eu/bootcd.git@master sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-10 nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-4 myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.3-3 # - sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-3.1-14 + sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-3.1-15 # tests-GITPATH := git://git.onelab.eu/tests.git@master diff --combined onelab-tags.mk index 0b61ea4e,dc59c699..8c621a23 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@@ -29,7 -29,7 +29,7 @@@ vsys-scripts-GITPATH := git: autoconf-GITPATH := git://git.onelab.eu/autoconf@autoconf-2.69-1 bind_public-GITPATH := git://git.onelab.eu/bind_public.git@bind_public-0.1-2 sliver-openvswitch-GITPATH := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-2.2.90-1 -plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.3-7 +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master drupal-GITPATH := git://git.onelab.eu/drupal.git@drupal-4.7-15 plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-5.2-5 www-register-wizard-GITPATH := git://git.onelab.eu/www-register-wizard.git@www-register-wizard-4.3-5 @@@ -47,14 -47,14 +47,14 @@@ rvm-ruby-BRANCH := planetla rvm-ruby-GITPATH := git://git.onelab.eu/rvm-ruby.git@rvm-ruby-1.22.9-1 oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### -bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.2-5 +bootcd-GITPATH := git://git.onelab.eu/bootcd.git@master sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-10 nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-4 myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.3-3 DistributedRateLimiting-GITPATH := git://git.onelab.eu/distributedratelimiting.git@DistributedRateLimiting-0.1-1 # - sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-3.1-14 + sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-3.1-15 # # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.onelab.eu/tests.git@master