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.

Sign up for GitHub

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

Jump to bottom

Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. #497

Merged
merged 3 commits into from
Oct 8, 2019
Merged

Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. #497

merged 3 commits into from
Oct 8, 2019

Conversation

swainn
Copy link
Member

@swainn swainn commented Oct 7, 2019

@coveralls
Copy link

coveralls commented Oct 7, 2019 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling cdc4c54 on Aquaveo:docker-salt-fix into e1849d6 on tethysplatform:master.

swainn added 2 commits October 7, 2019 17:11
@swainn
Tweaks to the db command create users methods to prevent exiting due …
8ab3d9b 
…to conflicts in the tethys db usernames - check if user exists first.

Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.
@swainn
Updates tests for db command.
cdc4c54
sdc50
sdc50 approved these changes Oct 8, 2019
View reviewed changes
Copy link
Member

@sdc50 sdc50 left a comment

Choose a reason for hiding this comment

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

It looks like most of these changes deal more with the database than with Salt, but notwithstanding they seem like good additions. 😉

@swainn
Copy link
Member Author

swainn commented Oct 8, 2019

Yes, sorry about that. The scope grew a bit. It's all related to getting our Docker image building and running again under various circumstances.

@swainn swainn merged commit cd54881 into tethysplatform:master Oct 8, 2019
@swainn swainn deleted the docker-salt-fix branch October 10, 2019 15:52
swainn added a commit that referenced this pull request Oct 7, 2022
@swainn
Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. (#497)
6cd4c9a 
* Pin salt to 2019.2.0 until they resolve issues with 2019.2.1.

* Tweaks to the db command create users methods to prevent exiting due to conflicts in the tethys db usernames - check if user exists first.
Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.

* Updates tests for db command.
swainn added a commit that referenced this pull request Oct 7, 2022
@swainn
Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. (#497)
5fa5372 
* Pin salt to 2019.2.0 until they resolve issues with 2019.2.1.

* Tweaks to the db command create users methods to prevent exiting due to conflicts in the tethys db usernames - check if user exists first.
Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.

* Updates tests for db command.
swainn added a commit to swainn/tethys that referenced this pull request Oct 8, 2022
@swainn
Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. (tethys…
e2c92ec 
…platform#497)

* Pin salt to 2019.2.0 until they resolve issues with 2019.2.1.

* Tweaks to the db command create users methods to prevent exiting due to conflicts in the tethys db usernames - check if user exists first.
Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.

* Updates tests for db command.
swainn added a commit to swainn/tethys that referenced this pull request Oct 8, 2022
@swainn
Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. (tethys…
18161bf 
…platform#497)

* Pin salt to 2019.2.0 until they resolve issues with 2019.2.1.

* Tweaks to the db command create users methods to prevent exiting due to conflicts in the tethys db usernames - check if user exists first.
Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.

* Updates tests for db command.
swainn added a commit to swainn/tethys that referenced this pull request Oct 8, 2022
@swainn
Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. (tethys…
23a7c41 
…platform#497)

* Pin salt to 2019.2.0 until they resolve issues with 2019.2.1.

* Tweaks to the db command create users methods to prevent exiting due to conflicts in the tethys db usernames - check if user exists first.
Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.

* Updates tests for db command.
swainn added a commit to swainn/tethys that referenced this pull request Oct 8, 2022
@swainn
Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. (tethys…
07f1adb 
…platform#497)

* Pin salt to 2019.2.0 until they resolve issues with 2019.2.1.

* Tweaks to the db command create users methods to prevent exiting due to conflicts in the tethys db usernames - check if user exists first.
Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.

* Updates tests for db command.
swainn added a commit that referenced this pull request Oct 9, 2022
@swainn
Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. (#497)
fe74634 
* Pin salt to 2019.2.0 until they resolve issues with 2019.2.1.

* Tweaks to the db command create users methods to prevent exiting due to conflicts in the tethys db usernames - check if user exists first.
Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.

* Updates tests for db command.
swainn added a commit that referenced this pull request Oct 13, 2022
@swainn
Pin salt to 2019.2.0 until they resolve issues with 2019.2.1. (#497)
0d3f3b1 
* Pin salt to 2019.2.0 until they resolve issues with 2019.2.1.

* Tweaks to the db command create users methods to prevent exiting due to conflicts in the tethys db usernames - check if user exists first.
Re-order the db superuser and normal user creation so that if there is a conflict the superuser will be created first.

* Updates tests for db command.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sdc50 sdc50 sdc50 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@swainn @coveralls @sdc50