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

Add DOBS_CONVERTUNDERSCORES env var to plugin config #1004

Merged
merged 1 commit into from Sep 7, 2017

Conversation

oppodeldoc
Copy link
Contributor

This addresses #997 by exposing the convertUnderscores option to the plugin config, so when the plugin is installed, setting DOBS_CONVERTUNDERSCORES to true will allow Docker compose or stack deploy to programmatically create volumes on DigitalOcean without breaking.

Also includes updated docs for this new option.

@CLAassistant
Copy link

CLAassistant commented Sep 7, 2017

CLA assistant check
All committers have signed the CLA.

@akutz
Copy link
Member

akutz commented Sep 7, 2017

Hi @oppodeldoc,

If you do not believe there is a compelling reason to keep them separate, could you please squash the commits on this PR? Thanks!

@codecov-io
Copy link

codecov-io commented Sep 7, 2017

Codecov Report

Merging #1004 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1004   +/-   ##
=======================================
  Coverage   34.11%   34.11%           
=======================================
  Files          36       36           
  Lines        2896     2896           
=======================================
  Hits          988      988           
  Misses       1806     1806           
  Partials      102      102

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0bc6821...213516f. Read the comment docs.

@oppodeldoc
Copy link
Contributor Author

Hi @akutz sorry about that. Squashed!

@akutz
Copy link
Member

akutz commented Sep 7, 2017

Hi @oppodeldoc,

Thanks! Although it doesn't appear you squashed it. There are still two commits on the PR.

@akutz
Copy link
Member

akutz commented Sep 7, 2017

Hi @oppodeldoc,

Oh, you squashed it via Github. Ugh. I hate their interface. Do you mind squashing it locally? All you have to do is this:

$ git fetch origin && git reset --hard origin/master
$ git reset --soft HEAD~2
$ git commit

That will uncommit the last two commits (yours and the one Github created) and allow you to commit them again as a single commit. Thanks!

@oppodeldoc
Copy link
Contributor Author

Oh, actually, I did squash it locally, then I hit "Update Branch" to merge it with current changes in master. I thought that'd make it easier, I'll re-submit though.

@akutz
Copy link
Member

akutz commented Sep 7, 2017

Makes sense. For what it's worth, I always do this:

$ git fetch upstream
$ git rebase upstream/master

A local rebase is cleaner and doesn't leave an additional commit when you're prepping a PR for merge.

@oppodeldoc
Copy link
Contributor Author

@akutz yeah, actually, I did that, it's the damn "update branch" button in Github. Lesson to self: Never click a button on Github :)

I rebased and forced a push, so this PR is clean again, 1 commit. I won't touch anything else Thanks!

@akutz
Copy link
Member

akutz commented Sep 7, 2017

No worries. Just thanks so much for handling this!

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.

None yet

4 participants