Skip to content

Conversation

pzrq
Copy link
Contributor

@pzrq pzrq commented Dec 9, 2016

@imlucas Please review as I think you know the most about how all these changes are likely to interact with each other. I have confirmed COMPASS-503 (SSH Tunnel + Auth) works on this branch after an npm run clean; npm install; npm start but am not so sure how to test the RTSS errors changes.

The RTSS changes are part of this branch due to cherry-pick merge conflicts that would otherwise require publishing a new data-service version without the RTSS changes.

Basically if I understand node-semver:

  • COMPASS-317 is actually already backported and went out in Compass v1.5.0 (as we are not using npm-shrinkwrap.json on this branch).
  • COMPASS-382 / COMPASS-383 (RTSS bug fixes including mongodb-js-errors changes) are also partly backported (there are some pure Compass-repo changes).
  • COMPASS-503 would as a bug fix be implicitly backported if we did a Compass v1.5.1 release

Would just like to confirm that's all kosher before merging to 1.5-releases, whether via this PR or via fast-forward merge along the branch as we tend to prefer.

@pzrq
Copy link
Contributor Author

pzrq commented Dec 16, 2016

Might be useful if we do a 1.5.1 release (COMPASS-408), otherwise is of no value.

@durran durran merged commit 1dfd99d into 1.5-releases Dec 20, 2016
@durran durran deleted the 1.5-releases-backport-compass-317-382-383-503 branch December 20, 2016 00:00
@durran
Copy link
Member

durran commented Dec 20, 2016

I think we're aiming to do a 1.5.1 tomorrow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants