Skip to content

Commit

Permalink
Update master branch for latest releases
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Stringer <[email protected]>
  • Loading branch information
joestringer committed Mar 5, 2020
1 parent 9c34630 commit 0178507
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions .github/cilium-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ column: "In progress"
move-to-projects-for-labels-xored:
v1.7:
needs-backport/1.7:
project: "https://github.com/cilium/cilium/projects/102"
project: "https://github.com/cilium/cilium/projects/105"
column: "Needs backport from master"
backport-pending/1.7:
project: "https://github.com/cilium/cilium/projects/102"
project: "https://github.com/cilium/cilium/projects/105"
column: "Backport pending to v1.7"
backport-done/1.7:
project: "https://github.com/cilium/cilium/projects/102"
project: "https://github.com/cilium/cilium/projects/105"
column: "Backport done to v1.7"
v1.6:
needs-backport/1.6:
project: "https://github.com/cilium/cilium/projects/99"
project: "https://github.com/cilium/cilium/projects/104"
column: "Needs backport from master"
backport-pending/1.6:
project: "https://github.com/cilium/cilium/projects/99"
project: "https://github.com/cilium/cilium/projects/104"
column: "Backport pending to v1.6"
backport-done/1.6:
project: "https://github.com/cilium/cilium/projects/99"
project: "https://github.com/cilium/cilium/projects/104"
column: "Backport done to v1.6"
v1.5:
needs-backport/1.5:
project: "https://github.com/cilium/cilium/projects/100"
project: "https://github.com/cilium/cilium/projects/103"
column: "Needs backport from master"
backport-pending/1.5:
project: "https://github.com/cilium/cilium/projects/100"
project: "https://github.com/cilium/cilium/projects/103"
column: "Backport pending to v1.5"
backport-done/1.5:
project: "https://github.com/cilium/cilium/projects/100"
project: "https://github.com/cilium/cilium/projects/103"
column: "Backport done to v1.5"
require-msgs-in-commit:
- msg: "Signed-off-by"
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ Listed below are the actively maintained release branches along with their lates
minor release, corresponding image pull tags and their release notes:

+-------------------------------------------------------+------------+-------------------------------------+---------------------------------------------------------------------------+------------------------------------------------------------------------+
| `v1.7 <https://github.com/cilium/cilium/tree/v1.7>`__ | 2020-02-18 | ``docker.io/cilium/cilium:v1.7.0`` | `Release Notes <https://github.com/cilium/cilium/releases/tag/v1.7.0>`__ | `General Announcement <https://cilium.io/blog/2020/02/18/cilium-17>`__ |
| `v1.7 <https://github.com/cilium/cilium/tree/v1.7>`__ | 2020-03-04 | ``docker.io/cilium/cilium:v1.7.1`` | `Release Notes <https://github.com/cilium/cilium/releases/tag/v1.7.1>`__ | `General Announcement <https://cilium.io/blog/2020/02/18/cilium-17>`__ |
+-------------------------------------------------------+------------+-------------------------------------+---------------------------------------------------------------------------+------------------------------------------------------------------------+
| `v1.6 <https://github.com/cilium/cilium/tree/v1.6>`__ | 2020-02-03 | ``docker.io/cilium/cilium:v1.6.6`` | `Release Notes <https://github.com/cilium/cilium/releases/tag/v1.6.6>`__ | `General Announcement <https://cilium.io/blog/2019/08/20/cilium-16>`__ |
| `v1.6 <https://github.com/cilium/cilium/tree/v1.6>`__ | 2020-03-04 | ``docker.io/cilium/cilium:v1.6.7`` | `Release Notes <https://github.com/cilium/cilium/releases/tag/v1.6.7>`__ | `General Announcement <https://cilium.io/blog/2019/08/20/cilium-16>`__ |
+-------------------------------------------------------+------------+-------------------------------------+---------------------------------------------------------------------------+------------------------------------------------------------------------+
| `v1.5 <https://github.com/cilium/cilium/tree/v1.5>`__ | 2020-02-03 | ``docker.io/cilium/cilium:v1.5.12`` | `Release Notes <https://github.com/cilium/cilium/releases/tag/v1.5.12>`__ | `General Announcement <https://cilium.io/blog/2019/04/24/cilium-15>`__ |
| `v1.5 <https://github.com/cilium/cilium/tree/v1.5>`__ | 2020-03-04 | ``docker.io/cilium/cilium:v1.5.13`` | `Release Notes <https://github.com/cilium/cilium/releases/tag/v1.5.13>`__ | `General Announcement <https://cilium.io/blog/2019/04/24/cilium-15>`__ |
+-------------------------------------------------------+------------+-------------------------------------+---------------------------------------------------------------------------+------------------------------------------------------------------------+

Functionality Overview
Expand Down

0 comments on commit 0178507

Please sign in to comment.