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

rtmp-services: Update Vaughn Live and Breakers ingests #10270

Merged
merged 1 commit into from
Mar 9, 2024

Conversation

invalidtask
Copy link
Contributor

Description

Updating list of ingest servers for Vaughn Live and Breakers. Also removed recommended settings. I'm not familar with github as I do not use any git stuff, so when I was told in PR #8174 to "force push," I have zero idea what that means or how to go about it. But I do know how to make a pull request. I apologize if this is done incorrectly, however.

Motivation and Context

Old ingest servers were listed and new ones were missing.

How Has This Been Tested?

Json file in OBS

Types of changes

  • Tweak (non-breaking change to improve existing functionality)

Checklist:

  • My code has been run through clang-format.
  • [ x ] I have read the contributing document.
  • My code is not on the master branch.
  • [ x ] The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@WizardCM WizardCM added the Services These are modifications to the Service list and are not tied to the release schedule label Feb 24, 2024
Copy link
Member

@Fenrirthviti Fenrirthviti left a comment

Choose a reason for hiding this comment

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

Approving only from a content standpoint. Commits and commit messages will need to be fixed before this is merged.

@RytoEX RytoEX self-assigned this Mar 7, 2024
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

I've fixed the issues with this PR manually.

In the future:

  1. Do not submit a PR from your fork's master branch.
  2. Use a single commit to update both package.json and services.json.
  3. Do not add additional commits to make more changes. Amend your commit, then force push to your remote git repo.

If you do not follow this advice, your future PRs may take longer to address or may be closed.

@RytoEX RytoEX added this to the OBS Studio 30.1 milestone Mar 9, 2024
@RytoEX RytoEX merged commit 725f495 into obsproject:master Mar 9, 2024
14 checks passed
@invalidtask
Copy link
Contributor Author

Noted. As I said, I am not familiar with git beyond a couple basic features. It's not something I utilize in my development process. I apologize and will attempt to implement the suggestions for future PRs (if any.)

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Services These are modifications to the Service list and are not tied to the release schedule
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants