Skip to content

COMPASS-839 Backport COMPASS-830 SSL / Atlas explicitly to 1.6-releases #812

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

Merged
merged 2 commits into from
Mar 2, 2017
Merged

COMPASS-839 Backport COMPASS-830 SSL / Atlas explicitly to 1.6-releases #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeb08e4
Backport: Fix options passing with new node driver (#778)
durran Feb 14, 2017
234f7f9
COMPASS-839: Backport COMPASS 830: Resolve SSL and Atlas issues (#811)
pzrq Mar 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@
"moment": "^2.10.6",
"mongodb": "^2.2.8",
"mongodb-collection-model": "^0.3.1",
"mongodb-connection-model": "^6.3.5",
"mongodb-data-service": "^2.12.2",
"mongodb-connection-model": "^6.4.2",
"mongodb-data-service": "^2.12.3",
"mongodb-database-model": "^0.1.2",
"mongodb-explain-plan-model": "^0.2.2",
"mongodb-extended-json": "^1.9.0",
Expand Down
4 changes: 0 additions & 4 deletions src/app/connect/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,6 @@ var ConnectView = View.extend({
if (this.clipboardText.match(/[?&]ssl=true/i)) {
this.connection.ssl = 'SYSTEMCA';
}
// if we connect to an Atlas instance, use SYSTEMCA as SSL option
if (this.connection.hostname.match(/mongodb.net$/i)) {
this.connection.ssl = 'SYSTEMCA';
}
this.updateForm();
// @note: durran: This fixes not being able to save a new favorite
// from a collection that was auto-filled from the clipboard. Needed
Expand Down