add UseIPAddrForServer configuration to not require DNS for 1.x

[aspyker]

No description provided.

[cloudbees-pull-request-builder]

ribbon-pull-requests #173 FAILURE
Looks like there's a problem with this pull request

[aspyker]

@allenxwang have you successfully performed any pull requests against the 1.x branch?

I see that the Netflix project lists the project as stale and 281 commits behind:

https://github.com/Netflix/ribbon/branches

I took the Netflix project, cloned it clean, made the changes in master branch and did a pull request for that (2.x):

#162

I then took my clone and made a branch from the 1.x branch. It also was 281 commits behind:

https://github.com/aspyker/ribbon/branches

Locally this builds fine, tests fine, and I even tested the jars in my end to end application and the property worked as expected (both globally and for a specific ribbon client config).

I haven't yet had to deal with branches and pull requests. Any guidance of how to get git to catch up would be nice. I can see that I could pull the Netflix master into my 1.x branch (UseIPAddrForServer1.x), but I don't think i want to do that as that would pull in all of the 2.x/master changes that aren't appropriate (the 281 commits).

I haven't found any git guides that cover this well enough.

If you want to cherry pick the changes from my 1.x branch, they have been locally tested and I believe them to be correct.

[allenxwang]

@aspyker This PR is created again master branch which is the branch for 2.x. That's why the build failed as it cannot merge master with changes in 1.x branch.

Can you try recreating the PR against the 1.x branch?

[aspyker]

ok, will try. canceling this one for now.