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

Skysocks rename #105

Merged
merged 6 commits into from
Jan 6, 2020
Merged

Skysocks rename #105

merged 6 commits into from
Jan 6, 2020

Conversation

Kifen
Copy link
Contributor

@Kifen Kifen commented Jan 3, 2020

Fixes #97

Changes:

  • Changed all occurrence of therealproxy and skyproxy to skysocks

How to test this PR:

@jdknives
Copy link
Member

jdknives commented Jan 3, 2020

@Kifen there are plenty of Milestone 2 commits that would get merged into master. We should not do that yet. This needs to be pointing to m2.

@Kifen
Copy link
Contributor Author

Kifen commented Jan 3, 2020

@jdknives should I close the PR?

@Kifen Kifen changed the base branch from master to milestone2 January 3, 2020 08:32
nkryuchkov
nkryuchkov suggested changes Jan 4, 2020
View reviewed changes
Copy link
Contributor

@nkryuchkov nkryuchkov left a comment

Choose a reason for hiding this comment

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

There are still some socksproxy strings that should be renamed as well.

README.md Outdated Show resolved Hide resolved
ci_scripts/run-internal-tests.sh Outdated Show resolved Hide resolved
docker/images/node/Dockerfile Outdated Show resolved Hide resolved
nkryuchkov
nkryuchkov suggested changes Jan 6, 2020
View reviewed changes
Copy link
Contributor

@nkryuchkov nkryuchkov left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good! However, make check is broken and needs to be fixed. Also, there's a merge conflict. I think we can merge after those are resolved.

@jdknives jdknives merged commit d9a73f4 into skycoin:milestone2 Jan 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nkryuchkov nkryuchkov nkryuchkov 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
@Kifen @jdknives @nkryuchkov