Skip to content

Conversation

@petersgiles
Copy link
Contributor

@andreasohlund @johnsimons I think I have this right...I did something weird with git and my pull request has more junk in it than I would like.

This fixes these

If OK I'll release early tomorrow

I have put in a few bits an pieces to smoke-test some scenarios around endpoint and heartbeats. I'd like some help removing them from the build on the TeamCity because they really only are of use during development

@andreasohlund andreasohlund changed the title Hotfix 1 3 5 Hotfix 1.3.5 Nov 11, 2015
@andreasohlund andreasohlund changed the title Hotfix 1.3.5 Hotfix-1.3.5 Nov 11, 2015
@andreasohlund
Copy link
Member

Looks like you branch the hotfix branch of develop? (could that be why all the extra commits are here)

What commits should be included in the hotfix?

@petersgiles
Copy link
Contributor Author

@johnsimons yes for some odd reason in my tests it could come through either way. This was what was causing the endpoint update issue.

@petersgiles
Copy link
Contributor Author

@andreasohlund I took the hotfix from master then realized the smoketest stuff I wanted to include was in develop. so i rebased the hotfix to develop. which only half worked so I merged develop into hotfix-1.3.5. In a nutshell it's all related to improving the quality of the app and solving those bugs

@petersgiles petersgiles added this to the 1.3.5 milestone Nov 13, 2015
@petersgiles petersgiles self-assigned this Nov 13, 2015
petersgiles pushed a commit that referenced this pull request Nov 13, 2015
@petersgiles petersgiles merged commit 8f57265 into master Nov 13, 2015
@petersgiles petersgiles deleted the hotfix-1.3.5 branch November 13, 2015 20:59
@petersgiles petersgiles restored the hotfix-1.3.5 branch November 13, 2015 21:05
@petersgiles petersgiles removed this from the 1.3.5 milestone Nov 13, 2015
@petersgiles petersgiles deleted the hotfix-1.3.5 branch November 14, 2015 00:14
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.

4 participants