Merge branch 'v6.3.1-RC4-dev' of github.com:StuartWheater/dsBaseClient into v6.3.1-RC4-dev

Author: StuartWheater

docker-compose_armadillo.yml

@@ -16,6 +16,6 @@ services:
 
     default:
         hostname: default
-        image: datashield/rock-junction-devel-permissive:latest
+        image: datashield/rock-knot-devel-permissive:latest
         environment:
             DEBUG: "FALSE"

tests/testthat/perf_files/default_perf_profile.csv

@@ -1,14 +1,14 @@
 "refer_name","rate","lower_tolerance","upper_tolerance"
-"conndisconn::perf::simple0","0.229","0.5","2"
-"ds.abs::perf::0","1.796","0.5","2"
-"ds.asInteger::perf:0","1.538","0.5","2"
-"ds.asList::perf:0","3.061","0.5","2"
-"ds.asNumeric::perf:0","1.548","0.5","2"
-"ds.assign::perf::0","3.556","0.5","2"
-"ds.class::perf::combine:0","3.149","0.5","2"
-"ds.colnames::perf:0","2.584","0.5","2"
-"ds.exists::perf::combine:0","7.138","0.5","2"
-"ds.length::perf::combine:0","6.385","0.5","2"
-"ds.mean::perf::combine:0","5.982","0.5","2"
-"ds.mean::perf::split:0","6.923","0.5","2"
-"void::perf::void::0","41810.0","0.5","2"
+"conndisconn::perf::simple0","0.06223","0.5","2"
+"ds.abs::perf::0","0.8101","0.5","2"
+"ds.asInteger::perf:0","0.8950","0.5","2"
+"ds.asList::perf:0","1.754","0.5","2"
+"ds.asNumeric::perf:0","0.8654","0.5","2"
+"ds.assign::perf::0","1.683","0.5","2"
+"ds.class::perf::combine:0","1.755","0.5","2"
+"ds.colnames::perf:0","1.099","0.5","2"
+"ds.exists::perf::combine:0","3.627","0.5","2"
+"ds.length::perf::combine:0","3.556","0.5","2"
+"ds.mean::perf::combine:0","3.548","0.5","2"
+"ds.mean::perf::split:0","3.508","0.5","2"
+"void::perf::void::0","24560.0","0.5","2"