Merge "Branch cut for stable/silicon stream"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1ca40ed0cd87e81b464d20952b5c7b410cc1e64a..25be085b24359bd9b319596d4534d29a72bdba67 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
       - id: gitlint
 
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 2.0.2
+    rev: 2.1.5
     hooks:
       - id: shellcheck
         exclude: >

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index ef5e1462cdfc26b99a738708eb934b5658d8784b..46855cef7b453e4ddf049812fc7763ce3d741d9e 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -204,23 +204,19 @@ accounts in the cloud so should ensure consistent performance.
      - CPUs
      - Memory
 
-   * - odl-standard-1
-     - 1
-     - 4
-
-   * - odl-standard-2
+   * - v3-standard-2
      - 2
      - 8
 
-   * - odl-standard-4
+   * - v3-standard-4
      - 4
      - 16
 
-   * - odl-standard-8
+   * - v3-standard-8
      - 8
      - 32
 
-   * - odl-standard-16
+   * - v3-standard-16
      - 16
      - 64