commit 0af79b64510b12edb883642cebaa2f6686212f3f
author Eric Newberry <enewberry@cs.ucla.edu> Wed Apr 29 00:55:16 2020 -0700
committer Eric Newberry <enewberry@cs.ucla.edu> Thu Apr 30 01:13:09 2020 -0700
tree deea63ca8dae5c4bf0c0bdf64a89c0640330adad
parent 15af8b58d501c401bc95da4abf39875da723fd97

add Docker platform for integration tests

refs #5108

Change-Id: I2855a5d87e4dbca6af02049e0cf423b7c893b2d0

.mailmap

diff --git a/.mailmap b/.mailmap
index a0686d3..c7bb7f3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
-<enewberry@email.arizona.edu> <enewberry@cs.arizona.edu>
+<enewberry@cs.ucla.edu> <enewberry@cs.arizona.edu>
+<enewberry@cs.ucla.edu> <enewberry@email.arizona.edu>
 <git@mail1.yoursunny.com> <sjx@a.integ.ndn-routing.emulab.net>
 <davidepesa@gmail.com> <davide.pesavento@lip6.fr>
 <lybmath2009@gmail.com> <lybmath@ucla.edu>