Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix permissions and group for /var/run/${{app_name}} folder in SystemV init script #382

Merged
merged 1 commit into from
Oct 20, 2014
Merged

Fix permissions and group for /var/run/${{app_name}} folder in SystemV init script #382

merged 1 commit into from
Oct 20, 2014

Conversation

artempyanykh
Copy link
Contributor

Fix for issue #381. Tested with Precise32 and Fedora18.

@kardapoltsev
Copy link
Member

LGTM, thanks! I'll merge this after travis build passed.

kardapoltsev added a commit that referenced this pull request Oct 20, 2014
Fix permissions and group for /var/run/${{app_name}} folder in SystemV init script
@kardapoltsev kardapoltsev merged commit a212200 into sbt:master Oct 20, 2014
@artempyanykh artempyanykh deleted the fix-varrun-permissions branch October 20, 2014 18:42
@muuki88
Copy link
Contributor

muuki88 commented Oct 20, 2014

@kardapoltsev can you merge this into the 0.7.x and 0.8.x branch?

@kardapoltsev
Copy link
Member

Well... :) Am I need to cherry-pick this commit into this branches? I don't know what we have currently in 0.7 and 0.8 branches. I'll know that it's my mistake but I know nothing about branches and releases in sbt-native-packager (:

@muuki88
Copy link
Contributor

muuki88 commented Oct 21, 2014

no problem @kardapoltsev :) Cherry-picking is the way to go. This is why we should start to merge only one-commit pull-requests as they are easier to integrated into different dev-branches.

These are the steps for integrating

git checkout master
git pull

if you haven't checked out the dev-branches do:

git checkout -b 0.7.x origin/0.7.x
git checkout -b 0.8.x origin/0.8.x

then

git checkout 0.7.x
git cherry-pick 3029508890b69b8122fac531a189a67d4687e971
git checkout 0.8.x
git cherry-pick 3029508890b69b8122fac531a189a67d4687e971
git push

If the cherry-pick doesn't work (for what ever reasons). We should reintegrate
the change in a separate pull requests as merging may introduce errors.

At the moment I'm just commenting if I integrated the commit. Maybe we should
add labels for that?

@kardapoltsev
Copy link
Member

Merged into 0.7.x and 0.8.x.
Thanks @muuki88 for so detailed answer!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants