Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

#997: Allowing alpha version tag on master branch to enable parallel … #1029

Conversation

tst-kfreiheit
Copy link
Collaborator

@tst-kfreiheit tst-kfreiheit commented Sep 28, 2018

Supports #997

…development of current verison on release branch, and next release on master

Migrating changes from master; same code on both branches. We need this in place before adding the alpha tag to the master branch, so release branch constructs its version string correctly.

…allel development of current verison on release branch, and next release on master
Copy link
Collaborator

@tst-rwildes tst-rwildes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good. Tested the new python script and it works great!

@tst-kfreiheit tst-kfreiheit merged commit 28edd56 into google:release_5.2.4 Sep 28, 2018
husf-dsheremata added a commit to husf-dsheremata/earthenterprise that referenced this pull request Jan 11, 2019
* 'master' of https://github.com/google/earthenterprise:
  google#997: Allowing alpha version tag on master branch to enable parallel development of current verison on release branch, and next release on master (google#1029)
  Fixes google#1004: don't read version file for tasks that don't need to read it (google#1005)
  google#788 Add flags for poi search, update documentation. (google#1010)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants