Skip to content

Commit

Permalink
Merge branch 'master' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
soapy1 committed Nov 14, 2018
2 parents 46891a4 + 07fb633 commit 5593b12
Show file tree
Hide file tree
Showing 1,638 changed files with 2,547,246 additions and 18,660 deletions.
171 changes: 171 additions & 0 deletions .cla-signers
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
# New contributors should email [email protected] to request a Contributor License Agreement
# that can be electronically signed. A signed contributor license agreement for a pull request
# author needs to be on file with Anaconda, Inc. for pull requests to be merged. This file,
# while not an official record, is used by conda-bot for the purposes of CLA status on pull
# requests.

# Each row in this file has three fields. The first field is github username. The second field
# is git id, the output of `git log -n1 --format="%aN <%aE>"` when HEAD is at a specific user's
# latest commit. The third column is the date the CLA was signed, or alternate disposition for
# the user's contributions.

# The second field, which is the git (not GitHub!) identifier for the user, is designed to
# work in conjunction with the .mailmap file at the root of this repository.

3kwa | Eugene Van den Bulke <[email protected]> | 2018-06-01
aburgm | Armin Burgmeier <[email protected]> | 2018-07-24
alanhdu | Alan Du <[email protected]> | 2018-06-05
aldanor | Ivan Smirnov <[email protected]> | 2018-07-24
alexbw | Alex Wiltschko <[email protected]> | 2018-05-23
almarklein | Almar Klein <[email protected]> | 2018-06-04
arkottke | Albert Kottke <[email protected]> | 2018-07-23
asmeurer | Aaron Meurer <[email protected]> | Anaconda, Inc.
aterrel | Andy R. Terrel <[email protected]> | Anaconda, Inc.
basnijholt | Bas Nijholt <[email protected]> | 2018-06-04
bearnshaw | Berton Earnshaw <[email protected]> | 2018-06-04
Bezier89 | James Sexton <[email protected]> | 2018-07-23
bilderbuchi | Christoph Buchner <[email protected]> | 2018-07-25
bkreider | Bradley Kreider <[email protected]> | Anaconda, Inc.
bluekeyes | Billy Keyes <[email protected]> | 2018-05-23
bradsaracik | Brad S <[email protected]> | 2018-07-28
brentp | Brent Pedersen <[email protected]> | 2018-07-23
bryevdv | Bryan Van de Ven <[email protected]> | Anaconda, Inc.
campos-ddc | Diogo de Campos <[email protected]> | 2018-06-01
certik | Ondřej Čertík <[email protected]> | 2018-07-24
cgranade | Christopher Granade <[email protected]> | 2018-09-21
chdoig | Christine Doig <[email protected]> | Anaconda, Inc.
chrislf | Chris Linton-Ford <[email protected]> | 2018-08-01
CJ-Wright | christopher <[email protected]> | 2018-08-20
csoja | Crystal Soja <[email protected]> | Anaconda, Inc.
cstich | Christoph Stich <[email protected]> | 2018-06-13
dan-blanchard | Dan Blanchard <[email protected]> | 2018-07-24
dawehner | Daniel Wehner <[email protected]> | 2018-06-02
ddale | Darren Dale <[email protected]> | 2018-07-26
dedalusj | Jacopo <[email protected]> | 2018-06-01
delicb | Bojan Delic <[email protected]> | 2018-07-24
desilinguist | Nitin Madnani <[email protected]> | 2018-06-01
dhirschfeld | David Hirschfeld <[email protected]> | 2018-07-25
dmkent | David Kent <[email protected]> | 2018-07-23
dorzel | Dylan Orzel <[email protected]> | Anaconda, Inc.
dsludwig | Derek Ludwig <[email protected]> | Anaconda, Inc.
electronwill | Will Warner <[email protected]> | Anaconda, Inc.
elehcim | Michele Mastropietro <[email protected]> | 2018-07-24
ericdill | Eric Dill <[email protected]> | 2018-06-04
esc | Valentin Haenel <[email protected]> | 2018-07-24
faph | Florenz A. P. Hollebrandse <[email protected]> | 2018-09-19
flaviomartins | Flavio Martins <[email protected]> | 2018-06-05
frol | Vlad Frolov <[email protected]> | 2018-06-04
goanpeca | Gonzalo Peña-Castellanos <[email protected]> | Anaconda, Inc.
gomyhr | Geir Ove Myhr <[email protected]> | 2018-06-07
gqmelo | Guilherme Quentel Melo <[email protected]> | 2018-05-24
groutr | Ryan Grout <[email protected]> | Anaconda, Inc.
guoci | guoci <[email protected]> | 2018-06-04
hajs | Henning Schroder <[email protected]> | 2018-06-01
hartzell | George Hartzell <[email protected]> | 2018-07-20
hubmann | Patricio Hubmann <[email protected]> | 2018-07-24
HugoTian | Tian Zhang <[email protected]> | Anaconda, Inc.
ijstokes | Ian Stokes-Rees <[email protected]> | Anaconda, Inc.
ilanschnell | Ilan Schnell <[email protected]> | Anaconda, Inc.
immerrr | immerrr <[email protected]> | 2018-07-30
jacoblsmith | Jacob Smith <[email protected]> | 2018-08-01
jaimergp | Jaime RGP <[email protected]> | 2018-06-01
jakirkham | John Kirkham <[email protected]> | 2018-08-02
jameswinegar | James Winegar <[email protected]> | 2018-07-23
JarnoRFB | Rüdiger Busche <[email protected]> | 2018-07-23
jerowe | Jillian Rowe <[email protected]> | 2018-07-23
jesse- | Jesse Hamer <[email protected]> | 2018-08-05
jharriman | Justyn Harriman <[email protected]> | 2018-07-30
jhunkeler | Joseph Hunkeler <[email protected]> | 2018-06-01
jjhelmus | Jonathan J. Helmus <[email protected]> | 2018-06-07
jni | Juan Nunez-Iglesias <[email protected]> | 2018-06-01
joelhullcio | [email protected] <[email protected]> | Anaconda, Inc.
joelkim | Joel Kim <[email protected]> | 2018-07-24
jrovegno | jrovegno <[email protected]> | 2018-07-31
jseabold | Skipper Seabold <[email protected]> | 2018-06-01
Juanlu001 | Juan Luis Cano Rodríguez <[email protected]> | 2018-06-01
jusjusjus | jusjusjus <[email protected]> | 2018-06-04
jwkvam | Jacques Kvam <[email protected]> | 2018-06-04
kalefranz | Kale Franz <[email protected]> | Anaconda, Inc.
kdeldycke | Kevin Deldycke <[email protected]> | 2018-06-05
kurtwheeler | Kurt Wheeler <[email protected]> | 2018-07-30
lidavidm | David Li <[email protected]> | Anaconda, Inc.
loriab | Lori A. Burns <[email protected]> | 2018-07-24
luc-j-bourhis | Luc J. Bourhis <[email protected]> | 2018-06-04
m-rossi | Marco Rossi <[email protected]> | 2018-06-09
Maggie-M | Maggie Mari <[email protected]> | Anaconda, Inc.
majidaldo | majidaldo <[email protected]> | 2018-07-24
malev | Marcos Vanetta <[email protected]> | Anaconda, Inc.
marcelotrevisani | Marcelo Duarte Trevisani <[email protected]> | 2018-06-04
mandeep | mandeep <[email protected]> | 2018-09-04
MaxNoe | Maximilian Noethe <[email protected]> | 2018-07-24
mbargull | Marcel Bargull <[email protected]> | 2018-06-04
mcg1969 | Michael Grant <[email protected]> | Anaconda, Inc.
mdeff | Michaël Defferrard <[email protected]> | 2018-07-23
mdengler | Martin Dengler <[email protected]> | 2018-06-28
megies | Tobias Megies <[email protected]> | 2018-07-24
melund | Morten Enemark Lund <[email protected]> | 2018-06-01
mguillau | Matthieu Guillaumin <[email protected]> | 2018-08-30
mika-fischer | Mika Fischer <[email protected]> | 2018-07-05
mingwandroid | Ray Donnelly <[email protected]> | Anaconda, Inc.
minrk | MinRK <[email protected]> | 2018-07-30
mmarchetti | Michael Marchetti <[email protected]> | Anaconda, Inc.
msarahan | Michael Sarahan <[email protected]> | Anaconda, Inc.
mutirri | irritum <[email protected]> | Anaconda, Inc.
mwiebe | Mark Wiebe <[email protected]> | Anaconda, Inc.
nehaljwani | Nehal J Wani <[email protected]> | 2018-06-01
nickeubank | Nick Eubank <[email protected]> | 2018-06-04
nicoddemus | Bruno Oliveira <[email protected]> | 2018-05-23
njalerikson | Odegard, Ken <[email protected]> | 2018-06-01
nouiz | Frederic Bastien <[email protected]> | 2018-06-11
ofek | Ofek Lev <[email protected]> | 2018-06-04
ohadravid | Ohad Ravid <[email protected]> | 2018-07-24
opoplawski | Orion Poplawski <[email protected]> | 2018-06-04
oyse | Øystein Idema Torget <[email protected]> | 2018-07-27
pelson | Phil Elson <[email protected]> | 2018-07-25
petebachant | Pete Bachant <[email protected]> | 2018-05-23
petercable | Peter Cable <[email protected]> | 2018-07-23
pkgw | Peter Williams <[email protected]> | 2018-06-04
pombredanne | Philippe Ombredanne <[email protected]> | 2018-06-04
quasiben | Benjamin Zaitlen <[email protected]> | Anaconda, Inc.
rafaelhbarros | Rafael de Barros <[email protected]> | Anaconda, Inc.
remram44 | Remi Rampin <[email protected]> | 2018-06-01
rgommers | Ralf Gommers <[email protected]> | 2018-07-23
sachinbiradar9 | Sachin G Biradar <[email protected]> | 2018-07-23
scopatz | Anthony Scopatz <[email protected]> | 2018-06-04
scw | Shaun Walbridge <[email protected]> | 2018-05-24
sdvillal | santi <[email protected]> | 2018-06-01
shadowwalkersb | shadow_walker <[email protected]> | 2018-06-04
ShannonGreen | Shannon Green <[email protected]> | 2018-07-26
soapy1 | Sophia Castellarin <[email protected]> | Anaconda, Inc.
soxofaan | Stefaan Lippens <[email protected]> | 2018-06-06
srossross | srossross <[email protected]> | Anaconda, Inc.
stefanseefeld | Stefan Seefeld <[email protected]> | Anaconda, Inc.
stuarteberg | Stuart Berg <[email protected]> | 2018-06-04
tadeu | Tadeu Manoel <[email protected]> | 2018-06-04
takluyver | Thomas Kluyver <[email protected]> | 2018-06-15
teake | Teake Nutma <[email protected]> | 2018-07-24
teoliphant | Travis E. Oliphant <[email protected]> | Anaconda, Inc.
tdhopper| Tim Hopper <[email protected]> | 2018-08-01
tomkinsc | Chris Tomkins-Tinch <[email protected]> | 2018-07-23
tpn | Trent Nelson <[email protected]> | 2018-08-01
tpowellcio | Troy Powell <tpowell@MathBook Pro.(none)> | Anaconda, Inc.
tswicegood | Travis Swicegood <[email protected]> | Anaconda, Inc.
twiecki | Thomas Wiecki <[email protected]> | 2018-07-24
tyler-thetyrant | Tyler Kim <[email protected]> | 2018-06-04
ukoethe | Ullrich Koethe <[email protected]> | 2018-07-24
vestuto | Jason Vestuto <[email protected]> | Anaconda, Inc.
wojdyr | Marcin Wojdyr <[email protected]> | 2018-06-01
wulmer | Wolfgang Ulmer <[email protected]> | 2018-06-11
Zaharid | Zahari <[email protected]> | 2018-07-24
zzag | Vlad Zagorodniy <[email protected]> | 2018-07-24


# Signed; no commits
fabioz | Fabio Zadrozny <> | 2018-08-24
jbcrail | Joseph Crail <> | 2018-06-01
jesse- | Jesse Hamer <> | 2018-08-05
ihnorton | Isaiah Norton <> | 2018-07-27
methane | INADA Naoki <> | 2018-07-23
ohadravid | Ohad Ravid <> | 2018-07-24
nickpowersys | Nicholas Brown <> | 2018-09-20
keszybz | Zbigniew Jędrzejewski-Szmek <> | 2018-09-21
1 change: 1 addition & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ignore:
- conda/console.py
- conda/cli/activate.py
- conda/cli/main_package.py
- conda/exports.py
- conda/gateways/connection/adapters/ftp.py
- conda/gateways/connection/adapters/s3.py
- tests/.*
Expand Down
Loading

0 comments on commit 5593b12

Please sign in to comment.