Merge branch 'master' of https://github.com/Microsoft/TypeScript into 11116

Author: zhengbli

.gitignore

@@ -41,7 +41,9 @@ tests/cases/**/*.js.map
 scripts/debug.bat
 scripts/run.bat
 scripts/word2md.js
+scripts/buildProtocol.js
 scripts/ior.js
+scripts/buildProtocol.js
 scripts/*.js.map
 scripts/typings/
 coverage/

.mailmap

@@ -1,32 +1,38 @@
 
-Alexander <[email protected]># Alexander Kuvaev
 AbubakerB <[email protected]> # Abubaker Bashir
+Alexander <[email protected]># Alexander Kuvaev
 Adam Freidin <[email protected]> Adam Freidin <[email protected]>
 Adi Dahiya <[email protected]> Adi Dahiya <[email protected]>
 Ahmad Farid <[email protected]> ahmad-farid <[email protected]>
+Alexander Rusakov  <[email protected]>
 Alex Eagle <[email protected]>
+Anatoly Ressin  <[email protected]>
 Anders Hejlsberg <[email protected]> unknown <[email protected]> unknown <[email protected]>
+Andrej Baran  <[email protected]>
 Andrew Z Allen <[email protected]>
 Andy Hanson <[email protected]> Andy <[email protected]>
 Anil Anar <[email protected]>
 Anton Tolmachev <[email protected]>
 Arnavion <[email protected]> # Arnav Singh
-Arthur Ozga <[email protected]> Arthur Ozga <[email protected]>
+Arthur Ozga <[email protected]> Arthur Ozga <[email protected]> Arthur Ozga  <[email protected]> Arthur Ozga  <[email protected]> Arthur Ozga  <[email protected]>
 Asad Saeeduddin <[email protected]>
 Schmavery <[email protected]> # Avery Morin
 Basarat Ali Syed <[email protected]> Basarat Syed <[email protected]> basarat <[email protected]>
 Bill Ticehurst <[email protected]> Bill Ticehurst <[email protected]>
 Ben Duffield <[email protected]>
+Ben Mosher  <[email protected]>
 Blake Embrey <[email protected]>
 Bowden Kelly <[email protected]>
 Brett Mayen <[email protected]>
 Bryan Forbes <[email protected]>
 Caitlin Potter <[email protected]>
 ChrisBubernak <[email protected]> unknown <[email protected]> # Chris Bubernak
+Christophe Vidal  <[email protected]>
 Chuck Jazdzewski <[email protected]>
 Colby Russell <[email protected]>
 Colin Snover <[email protected]>
 Cyrus Najmabadi <[email protected]> CyrusNajmabadi <[email protected]> unknown <[email protected]>
+Dafrok  <[email protected]> # Dafrok Zhang
 Dan Corder <[email protected]>
 Dan Quirk <[email protected]> Dan Quirk <[email protected]> nknown <[email protected]>
 Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
@@ -36,17 +42,22 @@ Denis Nedelyaev <[email protected]>
 Dick van den Brink <[email protected]> unknown <[email protected]> unknown <[email protected]>
 Dirk Baeumer <[email protected]> Dirk Bäumer <[email protected]> # Dirk Bäumer
 Dirk Holtwick <[email protected]>
+Dom Chen  <[email protected]>
 Doug Ilijev <[email protected]>
 Erik Edrosa <[email protected]>
+erictsangx  <[email protected]> # Eric Tsang
 Ethan Rubio <[email protected]>
 Evan Martin <[email protected]>
 Evan Sebastian <[email protected]>
 Eyas <[email protected]> # Eyas Sharaiha
+Fabian Cook  <[email protected]>
 falsandtru <[email protected]> # @falsandtru
 Frank Wallis <[email protected]>
-František Žiačik <[email protected]> František Žiačik <[email protected]>
+František Žiacik <[email protected]> František Žiacik <[email protected]>
+Gabe Moothart  <[email protected]>
 Gabriel Isenberg <[email protected]>
 Gilad Peleg <[email protected]>
+Godfrey Chan  <[email protected]>
 Graeme Wicksted <[email protected]>
 Guillaume Salles <[email protected]>
 Guy Bedford <[email protected]> guybedford <[email protected]>
@@ -55,6 +66,7 @@ Iain Monro <[email protected]>
 Ingvar Stepanyan <[email protected]>
 impinball <[email protected]> # Isiah Meadows
 Ivo Gabe de Wolff <[email protected]>
+Jakub Młokosiewicz  <[email protected]>
 James Whitney <[email protected]>
 Jason Freeman <[email protected]> Jason Freeman <[email protected]>
 Jason Killian <[email protected]>
@@ -69,11 +81,14 @@ Jonathan Park <[email protected]>
 Jonathan Turner <[email protected]> Jonathan Turner <[email protected]>
 Jonathan Toland <[email protected]>
 Jesse Schalken <[email protected]>
+Josh Abernathy  <[email protected]> joshaber  <[email protected]>
 Josh Kalderimis <[email protected]>
 Josh Soref <[email protected]>
 Juan Luis Boya García <[email protected]>
 Julian Williams <[email protected]>
-Herrington Darkholme <[email protected]>
+Justin Bay  <[email protected]>
+Justin Johansson  <[email protected]>
+Herrington Darkholme <[email protected]> (´·?·`)  <[email protected]> # Herrington Darkholme
 Kagami Sascha Rosylight <[email protected]> SaschaNaz <[email protected]>
 Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
 Kanchalai Tanglertsampan <[email protected]> Yui T <[email protected]>
@@ -82,23 +97,29 @@ Kanchalai Tanglertsampan <[email protected]> Yui <[email protected]>
 Kanchalai Tanglertsampan <[email protected]> yui T <[email protected]>
 Keith Mashinter <[email protected]> kmashint <[email protected]>
 Ken Howard <[email protected]>
+Kevin Lang  <[email protected]>
 kimamula <[email protected]> # Kenji Imamula
 Kyle Kelley <[email protected]>
 Lorant Pinter <[email protected]>
 Lucien Greathouse <[email protected]>
+Lukas Elmer  <[email protected]> Lukas Elmer  <[email protected]>
 Martin Vseticka <[email protected]> Martin Všeticka <[email protected]> MartyIX <[email protected]>
+gcnew  <[email protected]> # Marin Marinov
 vvakame <[email protected]> # Masahiro Wakame
 Matt McCutchen <[email protected]>
 Max Deepfield <[email protected]>
 Micah Zoltu <[email protected]>
+Michael  <[email protected]>
 Mohamed Hegazy <[email protected]>
 Nathan Shively-Sanders <[email protected]>
 Nathan Yee <[email protected]>
 Nima Zahedi <[email protected]>
+Noah Chen  <[email protected]>
 Noj Vek <[email protected]>
 mihailik <[email protected]> # Oleg Mihailik
 Oleksandr Chekhovskyi <[email protected]>
 Paul van Brenk <[email protected]> Paul van Brenk <[email protected]> unknown <[email protected]> unknown <[email protected]>	unknown <[email protected]>
+Omer Sheikh  <[email protected]>
 Oskar Segersva¨rd <[email protected]>
 pcan <[email protected]> # Piero Cangianiello
 pcbro <[email protected]> # @pcbro
@@ -109,21 +130,26 @@ progre <[email protected]> # @progre
 Prayag Verma <[email protected]>
 Punya Biswal <[email protected]>
 Rado Kirov <[email protected]>
-Ron Buckton <[email protected]> Ron Buckton <[email protected]>
+Ron Buckton <[email protected]> Ron Buckton <[email protected]> rbuckton  <[email protected]>
+Rostislav Galimsky  <[email protected]>
 Richard Knoll <[email protected]> Richard Knoll <[email protected]>
 Rowan Wyborn <[email protected]>
 Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
 Ryohei Ikegami <[email protected]>
 Sarangan Rajamanickam <[email protected]>
 Sébastien Arod <[email protected]>
+Sergey Shandar  <[email protected]>
 Sheetal Nandi <[email protected]>
 Shengping Zhong <[email protected]>
 [email protected] <[email protected]> # Shyyko Serhiy
+Sam El-Husseini  <[email protected]>
 Simon Hürlimann <[email protected]>
+Slawomir Sadziak  <[email protected]>
 Solal Pirelli <[email protected]>
 Stan Thomas <[email protected]>
 Stanislav Sysoev <[email protected]>
 Steve Lucco <[email protected]> steveluc <[email protected]>
+Sudheesh Singanamalla  <[email protected]>
 Tarik <[email protected]> # Tarik Ozket
 Tetsuharu OHZEKI <[email protected]> # Tetsuharu Ohzeki
 Tien Nguyen <[email protected]> tien <[email protected]> unknown <[email protected]> #Tien Hoanhtien
@@ -133,14 +159,58 @@ Tingan Ho <[email protected]>
 togru <[email protected]> # togru
 Tomas Grubliauskas <[email protected]>
 ToddThomson <[email protected]> # Todd Thomson
+Torben Fitschen  <[email protected]>
 TruongSinh Tran-Nguyen <[email protected]>
 vilicvane <[email protected]> # Vilic Vane
 Vladimir Matveev <[email protected]> vladima <[email protected]> v2m <[email protected]>
 Wesley Wigham <[email protected]> Wesley Wigham <[email protected]>
 York Yao <[email protected]> york yao <[email protected]> yaoyao <[email protected]>
 Yuichi Nukiyama <[email protected]> YuichiNukiyama <[email protected]>
 Zev Spitz <[email protected]>
-Zhengbo Li <[email protected]> zhengbli <[email protected]> Zhengbo Li <Zhengbo Li> Zhengbo Li <[email protected]> tinza123 <[email protected]> unknown <[email protected]> Zhengbo Li <Zhengbo Li>
+Zhengbo Li <[email protected]> zhengbli <[email protected]> Zhengbo Li <Zhengbo Li> Zhengbo Li <[email protected]> tinza123 <[email protected]> unknown <[email protected]> Zhengbo Li <Zhengbo Li> zhengbli  <[email protected]>
 zhongsp <[email protected]> # Patrick Zhong
 T18970237136 <[email protected]> # @T18970237136
-JBerger <[email protected]>
+JBerger <[email protected]>
+bootstraponline  <[email protected]> # @bootstraponline
+yortus  <[email protected]> # @yortus
+András Parditka  <[email protected]>
+Anton Khlynovskiy  <[email protected]>
+Charly POLY  <[email protected]>
+Cotton Hou  <[email protected]>
+Ethan Resnick  <[email protected]>
+Marius Schulz  <[email protected]>
+Mattias Buelens  <[email protected]>
+Myles Megyesi  <[email protected]>
+Tim Lancina  <[email protected]>
+Aaron Holmes <[email protected]> Aaron Holmes <[email protected]>
+Akshar Patel <[email protected]>
+Ali Sabzevari <[email protected]>
+Aliaksandr Radzivanovich <[email protected]>
+BuildTools <[email protected]> # Franklin Tse
+ChogyDan <[email protected]> # Daniel Hollocher
+Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
+David Kmenta <[email protected]>
+E020873 <[email protected]> # Nicolas Henry
+Elisée Maurer <[email protected]>
+Emilio García-Pumarino <[email protected]> dashaus <[email protected]>
+Guilherme Oenning <[email protected]>
+Herrington Darkholme <[email protected]>
+Ivo Gabe de Wolff <[email protected]>
+Joey Wilson <[email protected]>
+Jonathon Smith <[email protected]>
+Juan Luis Boya García <[email protected]>
+Kagami Sascha Rosylight <[email protected]>
+Lucien Greathouse <[email protected]>
+Martin Vseticka <[email protected]>
+Mattias Buelens <[email protected]>
+Michael Bromley <[email protected]>
+Paul Jolly <[email protected]>
+Perry Jiang <[email protected]>
+Peter Burns <[email protected]>
+Robert Coie <[email protected]>
+Thomas Loubiou <[email protected]>
+Tim Perry <[email protected]>
+Vidar Tonaas Fauske <[email protected]>
+Viktor Zozulyak <[email protected]>
+rix <[email protected]> # Richard Sentino
+rohitverma007 <[email protected]> # Rohit Verma

.npmignore

@@ -1,8 +1,11 @@
 built
 doc
+Gulpfile.ts
 internal
 issue_template.md
+jenkins.sh
 lib/README.md
+netci.groovy
 pull_request_template.md
 scripts
 src

.travis.yml

@@ -2,6 +2,7 @@ language: node_js
 
 node_js:
   - 'stable'
+  - '6'
   - '4'
 
 sudo: false
@@ -15,7 +16,7 @@ matrix:
 branches:
   only:
   - master
-  - release-2.0
+  - release-2.1
 
 install:
   - npm uninstall typescript