We need to get a fix for email notifications onto production quickly, please. Assuming production is running the 2.2.3 tag, we're not switching off of it. Steps: * If there are any local changes, |git stash| * git cherry-pick 65bd8795990592e310bbe053c25f77a5c4a99e38 * Re-apply local changes: |git stash apply| * Restart celery No need to flush caches.
Ricky mentions you probably need to do a |git fetch| before the cherry pick.
We are dealing with a production problem right now, this will have to wait.
Assignee: server-ops → aravind
I am getting ready to work on this, ping me in #webdev please.
[root@mradm02 prod]# git fetch remote: Counting objects: 283, done. remote: Compressing objects: 100% (143/143), done. remote: Total 214 (delta 132), reused 106 (delta 61) Receiving objects: 100% (214/214), 48.34 KiB, done. Resolving deltas: 100% (132/132), completed with 44 local objects. From http://github.com/jsocol/kitsune + f8a5c78...fd87bfc 2.2.x -> origin/2.2.x (forced update) 6975470..2a9a37e development -> origin/development 4197f60..ef0e846 master -> origin/master + 67ea53e...60e4e58 wiki -> origin/wiki (forced update) [root@mradm02 prod]#
[root@mradm02 prod]# git stash No local changes to save [root@mradm02 prod]# git cherry-pick 65bd8795990592e310bbe053c25f77a5c4a99e38 Finished one cherry-pick. [detached HEAD 4af045d]  Cache solution.question to avoid a db lookup in build_solution_notification Author: Paul Craciunoiu <email@example.com> Committer: root <firstname.lastname@example.org> Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email email@example.com If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name <firstname.lastname@example.org>' 2 files changed, 31 insertions(+), 0 deletions(-) [root@mradm02 prod]# git stash apply Nothing to apply [root@mradm02 prod]#
Status: NEW → RESOLVED
Last Resolved: 8 years ago
Resolution: --- → FIXED
Component: Server Operations: Web Operations → WebOps: Other
Product: mozilla.org → Infrastructure & Operations
You need to log in before you can comment on or make changes to this bug.