Skip to content

Commit

Permalink
Merge branch 'master' into devel
Browse files Browse the repository at this point in the history
# Conflicts:
#	History.md
#	packages/npm-mongo/.npm/package/npm-shrinkwrap.json
#	packages/npm-mongo/package.js
  • Loading branch information
filipenevola committed Mar 10, 2020
2 parents 573c9dc + b7a8b1e commit a8b31bc
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 8 deletions.
12 changes: 12 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ N/A
[Feature #333](https://github.com/meteor/meteor-feature-requests/issues/333),
[PR #10824](https://github.com/meteor/meteor/pull/10824)

## v1.9.3, 2020-03-09

### Breaking changes
N/A

### Migration Steps
N/A

### Changes
* `mongodb` driver package has been updated
from 3.2.7 to 3.5.4 [#10961](https://github.com/meteor/meteor/pull/10961)

## v1.9.2, 2020-02-20

### Breaking changes
Expand Down
2 changes: 1 addition & 1 deletion packages/meteor-tool/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "The Meteor command-line tool",
version: '1.9.2'
version: '1.9.3'
});

Package.includeTool();
6 changes: 3 additions & 3 deletions packages/npm-mongo/.npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/npm-mongo/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

Package.describe({
summary: "Wrapper around the mongo npm package",
version: "3.5.0",
version: "3.6.0",
documentation: null
});

Npm.depends({
mongodb: "3.5.2"
mongodb: "3.5.4"
});

Package.onUse(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/admin/meteor-release-experimental.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"track": "METEOR",
"version": "1.9.2-rc.1",
"version": "1.9.3-rc.0",
"recommended": false,
"official": false,
"description": "Meteor"
Expand Down
2 changes: 1 addition & 1 deletion scripts/admin/meteor-release-official.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"track": "METEOR",
"version": "1.9.2",
"version": "1.9.3",
"recommended": false,
"official": true,
"description": "The Official Meteor Distribution"
Expand Down

0 comments on commit a8b31bc

Please sign in to comment.