Skip to content

Sync release-0.6 branch with what is in the 0.6.2-12 RPM#368

Merged
jmrodri merged 3 commits intoopenshift:release-0.6from
jmrodri:fix-release-0.6
May 28, 2020
Merged

Sync release-0.6 branch with what is in the 0.6.2-12 RPM#368
jmrodri merged 3 commits intoopenshift:release-0.6from
jmrodri:fix-release-0.6

Conversation

@jmrodri
Copy link

@jmrodri jmrodri commented May 28, 2020

The 0.6.2-12 RPM release was apparently made from the release-0.7 branch by mistake back in 2018.
The release-0.7 commits are below

2018-08-06 15:41 -0400 David Zager                o [0.6.2] <python-openshift-0.6.2-12> Automatic commit of package [python-openshift] minor release [0.6.2-12].
2018-08-02 09:08 -0500 Andrew DeMaria             o Fix decode issue (#192)
2018-07-30 10:39 +0200 Fridolin Pokorny           o b64encode expects bytes not string
2018-07-23 15:55 -0400 Jason Montleon             M─┐ Merge pull request #185 from djzager/update-releasers
2018-07-23 15:51 -0400 David Zager                │ o Update releasers for 3.11
2018-07-23 15:49 -0400 David Zager                o─┘ <python-openshift-0.6.2-11> Automatic commit of package [python-openshift] minor release [0.6.2-11].
2018-07-13 14:46 -0400 Fabian von Feilitzsch      o include version update script
2018-07-13 14:45 -0400 Fabian von Feilitzsch      o Version bump to 0.6.2

The current release-0.6 commits look like this:

2019-10-23 13:53 -0400 Fabian von Feilitzsch      o [release-0.6] {upstream/release-0.6} <0.6.4> <v0.6.4> Bump version                                                                        
2019-10-23 13:47 -0400 Fabian von Feilitzsch      o py3 test fix (#330)
2019-10-22 16:22 -0400 Fabian von Feilitzsch      o Pin more requirements
2019-10-22 15:21 -0400 Fabian von Feilitzsch      o Reduce build matrix
2019-10-22 14:18 -0500 OpenShift Cherrypick Robot o Do not decode response data in Python2 (#329)
2019-10-22 15:12 -0400 Fabian von Feilitzsch      o Update tests and pin dependencies to prevent irrelevant failures
2018-08-17 12:58 -0400 Fabian von Feilitzsch      o <v0.6.3> Fix version pin to kubernetes 6.0.0, bump version
2018-07-13 14:46 -0400 Fabian von Feilitzsch      o [release-0.6.2] {upstream/release-0.6.2} <v0.6.2> include version update script
2018-07-13 14:45 -0400 Fabian von Feilitzsch      o Version bump to 0.6.2

So the only commits that I saw that were in release-0.7 when 0.6.2-12 was tagged and built are the following commits:

2018-08-02 09:08 -0500 Andrew DeMaria             o Fix decode issue (#192)
2018-07-30 10:39 +0200 Fridolin Pokorny           o b64encode expects bytes not string
2018-07-23 15:51 -0400 David Zager                │ o Update releasers for 3.11

The Automatic commit of package... commits have .spec file %changelog changes that I will pick up when I do a tito tag and release of the release-0.6 branch.

@jmrodri jmrodri changed the title Fix release 0.6 Sync release-0.6 branch with what is in the 0.6.2-12 RPM May 28, 2020
@jmrodri jmrodri requested a review from fabianvf May 28, 2020 19:47
@fabianvf
Copy link
Member

fabianvf commented May 28, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 28, 2020
@jmrodri jmrodri merged commit ec43fd1 into openshift:release-0.6 May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fabianvf fabianvf Awaiting requested review from fabianvf

Assignees

@fabianvf fabianvf

Labels

lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jmrodri @fabianvf @openshift-ci-robot @djzager @fridex @muff1nman