diff options
author | Philipp Haller <hallerp@gmail.com> | 2013-04-03 13:06:05 -0700 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2013-04-03 13:06:05 -0700 |
commit | b87b924ea82262c825a037d40d49ce4d61aa214a (patch) | |
tree | 073d097aec96d25230f3dfb55a89164036de7476 | |
parent | 3eabc750f4ba79c72b5541bc0971dfadd2d6f6ba (diff) | |
parent | 41a47b3ca7d2e9f9e683acbb8fe2a50cd37d54f6 (diff) | |
download | scala-async-b87b924ea82262c825a037d40d49ce4d61aa214a.tar.gz scala-async-b87b924ea82262c825a037d40d49ce4d61aa214a.tar.bz2 scala-async-b87b924ea82262c825a037d40d49ce4d61aa214a.zip |
Merge pull request #2 from viktorklang/patch-1
Update README.md
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -53,7 +53,7 @@ has finished, we trigger it again, and suspend again. Finally, we add the results and complete `combined`, which in turn will release line 5 (unless it had already timed out). -It is important to note that while this code is non-blocking, +It is important to note that while line 1-4 is non-blocking, it is not parallel. If we wanted to parallelize the two computations, we could rearrange the code as follows. |