Skip to content

Commit

Permalink
Merge tag 'release/METEOR@1.1-rc.1' into release-1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
avital committed Mar 28, 2015
2 parents b6fb6f5 + acee5d0 commit fa22f40
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion packages/blaze/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meteor Reactive Templating library",
version: '2.1.1-pre.win.1'
version: '2.1.1-pre.win.2'
});

Package.onUse(function (api) {
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.1.1-win.8'
version: '1.1.1-win.9'
});

Package.includeTool();
2 changes: 1 addition & 1 deletion packages/meteor/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Package.describe({
summary: "Core Meteor environment",
version: '1.1.5'
version: '1.1.6-rc.0'
});

Package.registerBuildPlugin({
Expand Down
2 changes: 1 addition & 1 deletion packages/templating/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Allows templates to be defined in .html files",
version: '1.1.1-rc.1'
version: '1.1.1-rc.2'
});

// Today, this package is closely intertwined with Handlebars, meaning
Expand Down
2 changes: 1 addition & 1 deletion packages/tracker/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Dependency tracker to allow reactive callbacks",
version: '1.0.7-pre.win.1'
version: '1.0.7-pre.win.2'
});

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.1-rc.0",
"version": "1.1-rc.1",
"recommended": false,
"official": false,
"description": "Release candidate of Meteor 1.1, the first release supported on Windows."
Expand Down

0 comments on commit fa22f40

Please sign in to comment.