| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Cherry-picked 3 changes from latest master, to stable/fraser
merged these 3 changes into stable/fraser
new commit ID: 0f43563624832c5908e6fc00eb0a4bbc6cc82c33
will need to be tagged as 6.1.1
patch#2: removed trailing spaces
Change-Id: I934dedb6c0b1efde2404f550cbd1a58e618ffc1a
Signed-off-by: Gerard Damm <gerard.damm@wipro.com>
|
|
master commit to use for 6.1.0:
b718a43380376d2b19222c4203c97a95ca849ae8
(note: opnfv-6.1.0 tag: 553ea71b7aa2eb7d9ff46316de367dff0844ce42)
(can/should a tag objet ID be used for a point release ?)
updated stable/fraser SHA1, to same SHA1 that was used for 6.0.0
(i.e. 3a957a75f99686767d13f45d74b5ca8463559b7b)
(I assume stable/fraser SHA1 should be the same as 6.0.0 SHA1 ?)
>The stable ref is the ref when the branch was created, it should not
>change
(cherry-picking for stable/fraser is not possible after 6.0.0 is
released)
>You can cherry pick as long as you want.
Change-Id: I887174801a56b374cae0197b31561673bc0435ea
Signed-off-by: Gerard Damm <gerard.damm@wipro.com>
|
|
patch 2:
fixed leading space issue
patch 3:
cherry-picked commits that were merged in master since initial
stable/fraser branch; applied to Auto stable/fraser; submitted;
used resulting new stable/fraser SHA1 as the SHA1 for
Auto release 6.0.0 (3a957...); didn't change original
stable/fraser SHA1 as Auto branch stable/fraser (5c811...);
branches: https://gerrit.opnfv.org/gerrit/#/admin/projects/auto,branches
changes: https://gerrit.opnfv.org/gerrit/#/q/project:auto
Change-Id: I39c6acaeacc749b17489553e2af52e06902d2828
Signed-off-by: Gerard Damm <gerard.damm@wipro.com>
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
on behalf of Tina Tsou PTL
Change-Id: Ib3779a67a09025b2433520566af060516ab6dc43
Signed-off-by: Gerard Damm <gerard.damm@wipro.com>
|
Gerard Damm