From 42303e2acba217af554294b1174ee53b5627cc33 Mon Sep 17 00:00:00 2001
From: Craig Taub <craigtaub@gmail.com>
Date: Mon, 18 Feb 2019 19:47:51 +0000
Subject: [PATCH] Release v6.0.0

---
 CHANGELOG.md      | 8 ++++----
 package-lock.json | 2 +-
 package.json      | 8 +++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c5a680a2e..3a13cdba4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,10 +91,10 @@ Enhancements introduced in [#3556](https://github.com/mochajs/mocha/issues/3556)
   - Use `--no-config` or `--no-package` to completely disable loading of configuration via RC file and `package.json`, respectively
   - Configurations are merged as applicable using the priority list:
     1. Command-line arguments
-    2. RC file
-    3. `package.json`
-    4. `mocha.opts`
-    5. Mocha's own defaults
+    1. RC file
+    1. `package.json`
+    1. `mocha.opts`
+    1. Mocha's own defaults
   - Check out these [example config files](https://github.com/mochajs/mocha/tree/master/example/config)
 
 - Node/V8 flag support in `mocha` executable:
diff --git a/package-lock.json b/package-lock.json
index fe089799e8..c0026c6930 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "6.0.0-1",
+  "version": "6.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9c71d4f639..cd0be45a87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "6.0.0-1",
+  "version": "6.0.0",
   "description": "simple, flexible, fun test framework",
   "keywords": [
     "mocha",
@@ -32,6 +32,7 @@
     "amsul <reach@amsul.ca>",
     "Anders Olsen Sandvik <Andersos@users.noreply.github.com>",
     "Andreas Brekken <andreas@opuno.com>",
+    "Andreas Lind <andreaslindpetersen@gmail.com>",
     "Andreas Lind Petersen <andreas@one.com>",
     "Andrew Krawchyk <903716+akrawchyk@users.noreply.github.com>",
     "Andrew Nesbitt <andrewnez@gmail.com>",
@@ -41,6 +42,7 @@
     "Angelica Valenta <angelicavalenta@gmail.com>",
     "Anis Safine <anis.safine.ext@francetv.fr>",
     "Anish Karandikar <anishkny@gmail.com>",
+    "Anna Henningsen <github@addaleax.net>",
     "Anthony <keppi@o2.pl>",
     "Anton <anton.redfox@gmail.com>",
     "anton <anton.valickij@gmail.com>",
@@ -87,6 +89,7 @@
     "Charles Merriam <charles.merriam@gmail.com>",
     "Charles Samborski <demurgos@demurgos.net>",
     "Charlie Rudolph <charles.w.rudolph@gmail.com>",
+    "Chen Yangjian <252317+cyjake@users.noreply.github.com>",
     "Chris <chrisleck@users.noreply.github.com>",
     "Chris Buckley <chris@cmbuckley.co.uk>",
     "Chris Lamb <chris@chris-lamb.co.uk>",
@@ -98,6 +101,7 @@
     "claudyus <claudyus@HEX.(none)>",
     "Connor Dunn <connorhd@gmail.com>",
     "Corey Butler <corey@coreybutler.com>",
+    "Corey Farrell <git@cfware.com>",
     "Cory Thomas <cory.thomas@bazaarvoice.com>",
     "Craig Taub <craigtaub@gmail.com>",
     "Cube <maty21@gmail.com>",
@@ -280,6 +284,7 @@
     "Mark Banner <standard8@mozilla.com>",
     "Mark Owsiak <mark.owsiak@gmail.com>",
     "Markus Tacker <m@coderbyheart.com>",
+    "Martijn Cuppens <martijn.cuppens@intracto.com>",
     "Martin Marko <marcus@gratex.com>",
     "Mathieu Desvé <mathieudesve@MacBook-Pro-de-Mathieu.local>",
     "Matija Marohnić <matija.marohnic@gmail.com>",
@@ -440,6 +445,7 @@
     "vlad <iamvlad@gmail.com>",
     "Vlad Magdalin <vlad@webflow.com>",
     "Volker Buzek <volker.buzek@sap.com>",
+    "Wanseob Lim <email@wanseob.com>",
     "Wil Moore III <wil.moore@wilmoore.com>",
     "Will Langstroth <will@langstroth.com>",
     "wsw <wsw0108@gmail.com>",