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

Ensure API document is available before returning name #2540

Merged

Conversation

brylie
Copy link
Contributor

@brylie brylie commented May 9, 2017

Closes #2528

Note, we will need to make a new patch-level release for this hotfix.

@marla-singer
Copy link
Contributor

marla-singer commented May 10, 2017

@brylie It is a little fix but I'm afraid that is not a solution of entire problem. Please make sure that removing API document with Proxy connection works as expected (related Proxy Backend is removed as well)

Also I think we need to create 0.43.1 version instead of 0.44.1 because apinf.io has 0.43.0 version

@bajiat
Copy link
Contributor

bajiat commented May 10, 2017

@marla-singer Can I assign you to this PR?

@marla-singer
Copy link
Contributor

@bajiat Yes

@brylie
Copy link
Contributor Author

brylie commented May 11, 2017

Don't merge yet.

@brylie
Copy link
Contributor Author

brylie commented May 12, 2017

@bajiat should we release this as a 0.43.1 or 0.44.1 patch? If we want to make it available quickly, we discussed that 0.43.1 is better than 0.44.1. Otherwise, if we plan to upgrade customer deployments soon with 0.44.x, then 0.44.1 would be alright.

@marla-singer
Copy link
Contributor

@brylie What status of this PR?

@brylie
Copy link
Contributor Author

brylie commented May 16, 2017

I think at this point we should target the PR for 0.44.1, so we can finish the work.

cc: @bajiat

@bajiat
Copy link
Contributor

bajiat commented May 16, 2017

At this point it should be 44.1

@marla-singer
Copy link
Contributor

marla-singer commented May 16, 2017

@brylie Are you sure that we need to merge it directly to master branch? In this case develop will differ from master

@brylie
Copy link
Contributor Author

brylie commented May 16, 2017

@mauriciovieira, @ashakunt, @kumargs: If we merge this branch in to master, for the 0.44.1 patch level release, how should we also merge this change into develop?

@brylie
Copy link
Contributor Author

brylie commented May 16, 2017

@brylie Are you sure that we need to merge it directly to master branch? In this case develop will differ from master

@marla-singer I dont know exactly what steps to take.

The Gitflow diagram shows 'hotfix' branches being opened against master. Also, the Gitflow tool opens 'hotfix' branches against master, so I just followed those guidelines.

@brylie
Copy link
Contributor Author

brylie commented May 17, 2017

Since we have not heard back in 24 hours, I propose we merge this PR into master and rebase the changes into develop. @marla-singer thoughts?

@marla-singer
Copy link
Contributor

@brylie Can you test it local?
Maybe rebase is a litlle bit bad because rebase changes commit tree.
Gitflow diagram also has notice "Incorporate bugfix in develop"

@brylie
Copy link
Contributor Author

brylie commented May 17, 2017

I just re-read the instructions you mentioned. We can merge this PR and then I will run the following commands:

Next, include the bugfix in develop, too:

$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff hotfix-1.2.1
Merge made by recursive.
(Summary of changes)

@marla-singer
Copy link
Contributor

@brylie ok, let's try

@marla-singer marla-singer merged commit c3cb04a into master May 17, 2017
@marla-singer marla-singer mentioned this pull request May 17, 2017
@marla-singer marla-singer deleted the hotfix/fix-apiName-helper-and-dashboard-subscriptions branch July 25, 2017 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants