Skip to content
This repository has been archived by the owner on Mar 28, 2019. It is now read-only.

Prepare 2.10.3 #579

Merged
merged 6 commits into from
Nov 18, 2015
Merged

Prepare 2.10.3 #579

merged 6 commits into from
Nov 18, 2015

Conversation

leplatrem
Copy link
Contributor

Step 1: Bug fix release branch

$ git co -b prepare-2.10.3
$ git reset --hard origin/2.10.x
$ git cherry-pick -m 1 <commit merge PR>
$ git cherry-pick -m 1 <commit merge PR>
....

$ prerelease
$ vim CHANGELOG.rst
$ vim cliquet_docs/conf.py
$ make build-requirements
$ git ci -a --amend
$ git push origin prepare-X.Y.Z
  • Open PR for prepare-X.Y.Z on 2.10.x

Step 2: Merge into 2.10.x

  • Press merge :)
$ git co 2.10.x
$ git pull origin 2.10.x
$ release
$ postrelease  # towards 2.10.3.dev

Actions performed by release/postrelease:

  • Tag vX.Y.Z
  • Publish on Pypi
  • Push origin 2.10.x
  • Add entry in Github release page
  • Configure the version in ReadTheDocs

Step 3: Merge into 2.10.x into master

$ git co master
$ git cherry-pick -m 1 <commit merge 2.10.x>    # Only changelog
  • Merge CHANGELOG, requirements, docs/conf.py

leplatrem and others added 3 commits November 17, 2015 12:15
…-principals

Fix principals of permission backend not being plugged by default
@Natim
Copy link
Contributor

Natim commented Nov 17, 2015

r+

leplatrem and others added 2 commits November 18, 2015 08:54
…gins

Initalize Service class attributes before including plugins
Fix Redis error traces not being logged (fixes #560)
@leplatrem leplatrem changed the title [WIP] Prepare 2.10.3 Prepare 2.10.3 Nov 18, 2015
leplatrem added a commit that referenced this pull request Nov 18, 2015
@leplatrem leplatrem merged commit e2a2439 into 2.10.x Nov 18, 2015
@leplatrem leplatrem deleted the prepare-2.10.3 branch November 18, 2015 11:28
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

2 participants