[Pkg-javascript-commits] [node-async] 397/480: Merge remote-tracking branch 'ognivo/feature-seq'

Jonas Smedegaard js at moszumanska.debian.org
Fri May 2 08:58:46 UTC 2014


This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository node-async.

commit 1513f799ddf351473d01172626eaa4935e11cfa1
Merge: e5ae810 49faae6
Author: Caolan McMahon <caolan at caolanmcmahon.com>
Date:   Fri Mar 28 15:02:50 2014 +0000

    Merge remote-tracking branch 'ognivo/feature-seq'
    
    Conflicts:
    	README.md

 README.md          | 48 ++++++++++++++++++++++++++++++
 lib/async.js       |  8 +++--
 test/test-async.js | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 141 insertions(+), 2 deletions(-)

diff --cc README.md
index fd9282a,f3175f5..8f4a1c8
--- a/README.md
+++ b/README.md
@@@ -127,26 -125,27 +127,27 @@@ Usage
  
  ### Control Flow
  
 -* [series](#series)
 -* [parallel](#parallel)
 -* [parallelLimit](#parallellimittasks-limit-callback)
 -* [whilst](#whilst)
 -* [doWhilst](#doWhilst)
 -* [until](#until)
 -* [doUntil](#doUntil)
 -* [forever](#forever)
 -* [waterfall](#waterfall)
 -* [compose](#compose)
 -* [seq](#seq)
 -* [applyEach](#applyEach)
 -* [applyEachSeries](#applyEachSeries)
 -* [queue](#queue)
 -* [cargo](#cargo)
 -* [auto](#auto)
 -* [iterator](#iterator)
 -* [apply](#apply)
 -* [nextTick](#nextTick)
 -* [times](#times)
 -* [timesSeries](#timesSeries)
 +* [`series`](#series)
 +* [`parallel`](#parallel)
 +* [`parallelLimit`](#parallellimittasks-limit-callback)
 +* [`whilst`](#whilst)
 +* [`doWhilst`](#doWhilst)
 +* [`until`](#until)
 +* [`doUntil`](#doUntil)
 +* [`forever`](#forever)
 +* [`waterfall`](#waterfall)
 +* [`compose`](#compose)
++* [`seq`](#seq)
 +* [`applyEach`](#applyEach)
 +* [`applyEachSeries`](#applyEachSeries)
 +* [`queue`](#queue)
 +* [`cargo`](#cargo)
 +* [`auto`](#auto)
 +* [`iterator`](#iterator)
 +* [`apply`](#apply)
 +* [`nextTick`](#nextTick)
 +* [`times`](#times)
 +* [`timesSeries`](#timesSeries)
  
  ### Utils
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-async.git



More information about the Pkg-javascript-commits mailing list