Merge "rename the project name for anteater for docker build"

diff --git a/prototypes/bifrost/scripts/bifrost-provision.sh b/prototypes/bifrost/scripts/bifrost-provision.sh
index 0561962..2b90215 100755 (executable)
--- a/prototypes/bifrost/scripts/bifrost-provision.sh
+++ b/prototypes/bifrost/scripts/bifrost-provision.sh
@@ -57,8 +57,8 @@ WRITE_INTERFACES_FILE=true
 export DIB_DEV_USER_PWDLESS_SUDO=yes
 export DIB_DEV_USER_PASSWORD=devuser
 
-# Settings for distro: trusty/ubuntu-minimal, 7/centos7, 42.2/suse
-export DIB_OS_RELEASE=${DIB_OS_RELEASE:-trusty}
+# Settings for distro: xenial/ubuntu-minimal, 7/centos7, 42.2/suse
+export DIB_OS_RELEASE=${DIB_OS_RELEASE:-xenial}
 export DIB_OS_ELEMENT=${DIB_OS_ELEMENT:-ubuntu-minimal}
 
 # DIB OS packages

diff --git a/utils/test/reporting/LICENSE.txt b/utils/test/reporting/LICENSE.txt
index d447b56..4d0b33c 100644 (file)
--- a/utils/test/reporting/LICENSE.txt
+++ b/utils/test/reporting/LICENSE.txt
@@ -1,5 +1,5 @@
-Creative Commons Attribution 3.0 Unported\r
-http://creativecommons.org/licenses/by/3.0/\r
+This work is licensed under a Creative Commons Attribution 4.0 International License.\r
+SPDX-License-Identifier: CC-BY-4.0\r
 \r
 License\r
 \r

diff --git a/utils/test/reporting/README.txt b/utils/test/reporting/README.txt
index 31b8d04..049cf62 100644 (file)
--- a/utils/test/reporting/README.txt
+++ b/utils/test/reporting/README.txt
@@ -1,6 +1,6 @@
 Phantom by HTML5 UP\r
 html5up.net | @ajlkn\r
-Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)\r
+SPDX-License-Identifier: CC-BY-4.0\r
 \r
 \r
 This is Phantom, a simple design built around a grid of large, colorful, semi-interactive\r
@@ -30,4 +30,4 @@ Credits:
                html5shiv.js (@afarkas @jdalton @jon_neal @rem)\r
                Misc. Sass functions (@HugoGiraudel)\r
                Respond.js (j.mp/respondjs)\r
-               Skel (skel.io)
\ No newline at end of file
+               Skel (skel.io)\r