Skip to content

Commit

Permalink
Merge branch 'hotfix/1.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
g-andrade committed Sep 3, 2017
2 parents a818e8f + 3aac89b commit 2438a37
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Copyright (c) 2015 Guilherme Andrade

__Version:__ 1.2.1
__Version:__ 1.2.2

__Authors:__ Guilherme Andrade ([`g@gandrade.net`](mailto:g@gandrade.net)).

Expand All @@ -19,9 +19,9 @@ __Authors:__ Guilherme Andrade ([`g@gandrade.net`](mailto:g@gandrade.net)).

```erlang

Tasks = #{ some_task => taskforce:task(function work/0, Args, #{ timeout => 2000 }),
similar_task => taskforce:task(function work/0, Args123, #{ timeout => 2500 }),
other_task => taskforce:task(function other_work/0, OtherArgs, #{ timeout => 500 }) }.
Tasks = #{ some_task => taskforce:task(fun work/0, Args, #{ timeout => 2000 }),
similar_task => taskforce:task(fun work/0, Args123, #{ timeout => 2500 }),
other_task => taskforce:task(fun other_work/1, OtherArgs, #{ timeout => 500 }) }.

```

Expand Down
8 changes: 4 additions & 4 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Copyright (c) 2015 Guilherme Andrade

__Version:__ 1.2.1
__Version:__ 1.2.2

__Authors:__ Guilherme Andrade ([`g@gandrade.net`](mailto:g@gandrade.net)).

Expand All @@ -18,9 +18,9 @@ __Authors:__ Guilherme Andrade ([`g@gandrade.net`](mailto:g@gandrade.net)).

```erlang

Tasks = #{ some_task => taskforce:task(function work/0, Args, #{ timeout => 2000 }),
similar_task => taskforce:task(function work/0, Args123, #{ timeout => 2500 }),
other_task => taskforce:task(function other_work/0, OtherArgs, #{ timeout => 500 }) }.
Tasks = #{ some_task => taskforce:task(fun work/0, Args, #{ timeout => 2000 }),
similar_task => taskforce:task(fun work/0, Args123, #{ timeout => 2500 }),
other_task => taskforce:task(fun other_work/1, OtherArgs, #{ timeout => 500 }) }.

```

Expand Down
10 changes: 5 additions & 5 deletions doc/overview-summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
<div class="navbar"><a name="#navbar_top"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
<h1>taskforce</h1>
<p>Copyright © 2015 Guilherme Andrade</p>
<p><b>Version:</b> 1.2.1</p>
<p><b>Version:</b> 1.2.2</p>
<p><b>Authors:</b> Guilherme Andrade (<a href="mailto:g@gandrade.net"><tt>g@gandrade.net</tt></a>).</p>
<p><code>taskforce</code> allows you to parallelise arbitrary tasks in a controlled way.</p>

<hr>

<h3><a name="Creating_tasks">Creating tasks</a></h3>
<pre lang="erlang">
Tasks = #{ some_task =&gt; taskforce:task(function work/0, Args, #{ timeout =&gt; 2000 }),
similar_task =&gt; taskforce:task(function work/0, Args123, #{ timeout =&gt; 2500 }),
other_task =&gt; taskforce:task(function other_work/0, OtherArgs, #{ timeout =&gt; 500 }) }.
Tasks = #{ some_task =&gt; taskforce:task(fun work/0, Args, #{ timeout =&gt; 2000 }),
similar_task =&gt; taskforce:task(fun work/0, Args123, #{ timeout =&gt; 2500 }),
other_task =&gt; taskforce:task(fun other_work/1, OtherArgs, #{ timeout =&gt; 500 }) }.
</pre>

<h3><a name="Executing_tasks">Executing tasks</a></h3>
Expand Down Expand Up @@ -84,6 +84,6 @@ <h3><a name="Full_example">Full example</a></h3>

<hr>
<div class="navbar"><a name="#navbar_bottom"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
<p><i>Generated by EDoc, Apr 30 2017, 23:05:29.</i></p>
<p><i>Generated by EDoc, Sep 3 2017, 17:52:11.</i></p>
</body>
</html>
8 changes: 4 additions & 4 deletions doc/overview.edoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

@author Guilherme Andrade <g@gandrade.net>
@copyright 2015 Guilherme Andrade
@version 1.2.1
@version 1.2.2
@title taskforce
@doc `taskforce' allows you to parallelise arbitrary tasks in a controlled way.

<hr/>

== Creating tasks ==
<pre lang="erlang">
Tasks = #{ some_task => taskforce:task(function work/0, Args, #{ timeout => 2000 }),
similar_task => taskforce:task(function work/0, Args123, #{ timeout => 2500 }),
other_task => taskforce:task(function other_work/0, OtherArgs, #{ timeout => 500 }) }.
Tasks = #{ some_task => taskforce:task(fun work/0, Args, #{ timeout => 2000 }),
similar_task => taskforce:task(fun work/0, Args123, #{ timeout => 2500 }),
other_task => taskforce:task(fun other_work/1, OtherArgs, #{ timeout => 500 }) }.
</pre>

== Executing tasks ==
Expand Down
2 changes: 1 addition & 1 deletion doc/taskforce.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ <h3 class="function"><a name="task-3">task/3</a></h3>
<hr>

<div class="navbar"><a name="#navbar_bottom"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
<p><i>Generated by EDoc, Apr 30 2017, 23:05:29.</i></p>
<p><i>Generated by EDoc, Sep 3 2017, 17:52:11.</i></p>
</body>
</html>
8 changes: 4 additions & 4 deletions overview.edoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

@author Guilherme Andrade <g@gandrade.net>
@copyright 2015 Guilherme Andrade
@version 1.2.1
@version 1.2.2
@title taskforce
@doc `taskforce' allows you to parallelise arbitrary tasks in a controlled way.

<hr/>

== Creating tasks ==
<pre lang="erlang">
Tasks = #{ some_task => taskforce:task(function work/0, Args, #{ timeout => 2000 }),
similar_task => taskforce:task(function work/0, Args123, #{ timeout => 2500 }),
other_task => taskforce:task(function other_work/0, OtherArgs, #{ timeout => 500 }) }.
Tasks = #{ some_task => taskforce:task(fun work/0, Args, #{ timeout => 2000 }),
similar_task => taskforce:task(fun work/0, Args123, #{ timeout => 2500 }),
other_task => taskforce:task(fun other_work/1, OtherArgs, #{ timeout => 500 }) }.
</pre>

== Executing tasks ==
Expand Down

0 comments on commit 2438a37

Please sign in to comment.