Merge branch 'izaakschroeder-no-globals' and 'konklone-pausing' into …

…1.0.6 Conflicts: lib/s3-upload-stream.js
nathanpeck · Oct 20, 2014 · 40f3abe · 40f3abe
2 parents 5ebb15c + 3a499c0
commit 40f3abe
Show file tree

Hide file tree

Showing 2 changed files with 326 additions and 309 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ A pipeable write stream which uploads to Amazon S3 using the multipart file uplo
 
 #### 1.0.4 (2014-10-13)
 
-Getting rid of the use of setImmeadiate. Also now the MPU is not initialized until data is actually received by the writable stream, and error checking verifies that data has actually been uploaded to S3 before trying to end the stream. This fixes an issue where empty incoming streams were causing errors to come back from S3 as the module was attempting to complete an empty MPU.
+Getting rid of the use of setImmediate. Also now the MPU is not initialized until data is actually received by the writable stream, and error checking verifies that data has actually been uploaded to S3 before trying to end the stream. This fixes an issue where empty incoming streams were causing errors to come back from S3 as the module was attempting to complete an empty MPU.
 
 #### 1.0.3 (2014-10-12)