summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Early <aearly@fluid.com>2015-05-20 16:39:09 -0700
committerAlexander Early <aearly@fluid.com>2015-05-20 16:39:09 -0700
commitbb33062759891a2c68df44687eb0a7dc20a31810 (patch)
treebda3ea6ec1976b0fa4ea809d1cf9bc6a186aa91d
parente417af6c1e20374bb04468fe5a789fef701d0bec (diff)
downloadasync-bb33062759891a2c68df44687eb0a7dc20a31810.tar.gz
update changelog for 1.0.0
-rw-r--r--CHANGELOG.md4
-rwxr-xr-xsupport/sync-package-managers.js2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3ce9d0..7d39c37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ Changes:
- Detect deadlocks in `auto` (#663)
- Better support for require.js (#527)
- Throw if queue created with concurrency `0` (#714)
-- Doc fixes (#542 #596 #615 #628 #631 #690)
+- Fix unneeded iteration in `queue.resume()` (#758)
+- Guard against timer mocking overriding `setImmediate` (#609 #611)
+- Miscellaneous doc fixes (#542 #596 #615 #628 #631 #690 #729)
- Use single noop function internally (#546)
- Optimize internal `_each`, `_map` and `_keys` functions.
diff --git a/support/sync-package-managers.js b/support/sync-package-managers.js
index 30cb7c2..5b26119 100755
--- a/support/sync-package-managers.js
+++ b/support/sync-package-managers.js
@@ -43,7 +43,7 @@ var componentSpecific = {
};
var componentInclude = ['name', 'description', 'version', 'keywords',
- 'license'];
+ 'license', 'main'];
var bowerJson = _.merge({}, _.pick(packageJson, bowerInclude), bowerSpecific);
var componentJson = _.merge({}, _.pick(packageJson, componentInclude), componentSpecific);