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

Remove SingularityServiceBase module, no longer needed #1671

Merged
merged 4 commits into from Dec 4, 2017
Merged

Conversation

@ssalinas
Copy link
Member

@ssalinas ssalinas commented Dec 4, 2017

SingularityServiceBase was originally split out when we were toying with the coordinator and had the possibility of two modules which could serve up the UI. Due to the fact that the way we package and access the UI internally slightly differs from our release process, we didn't catch the fact that moving this to another module messes with the static resources for the SingularityService shaded jar.

This PR puts all of the SingularityServiceBase bits back into SingularityService now that the separate module is no longer needed

/fixes #1670

ssalinas added 2 commits Dec 4, 2017
@ssalinas ssalinas added the hs_staging label Dec 4, 2017
@ssalinas ssalinas added this to the 0.18.2 milestone Dec 4, 2017
@ssalinas ssalinas added the hs_qa label Dec 4, 2017
@@ -63,7 +63,7 @@ database:
url: jdbc:mysql://[database host]:[database port]/[database name]
mesos:
master: http://[mesos master hostname]/api/v1/scheduler
master: [comma separated list of mesos master host:post]

This comment has been minimized.

@baconmania

baconmania Dec 4, 2017
Contributor

host:port?

@baconmania
Copy link
Contributor

@baconmania baconmania commented Dec 4, 2017

Good to go other than the small typo there.

@baconmania
Copy link
Contributor

@baconmania baconmania commented Dec 4, 2017

🚢

@ssalinas ssalinas added the hs_stable label Dec 4, 2017
@ssalinas ssalinas merged commit c11c8a4 into master Dec 4, 2017
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ssalinas ssalinas deleted the assets_fix branch Dec 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants
You can’t perform that action at this time.