Merge pull request #603 from jsquyres/pr/v1.4.1/release-prep

Pr/v1.4.1/release prep
ofiwg · Feb 3, 2017 · 13ce333 · 13ce333
2 parents 189988f + 47c7ce1
commit 13ce333
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,14 +1,16 @@
 Arun C Ilango <arun.ilango@intel.com>
 arun ilango <a-ilango@users.noreply.github.com>
 Arun Ilango <arun.ilango@intel.com>
-Ben Turrubiates <bturrubiates@lanl.gov>
 Ben Turrubiates <bturrubi@cisco.com>
+Ben Turrubiates <bturrubiates@lanl.gov>
 Charles J Archer <charles.j.archer@intel.com>
 Chen Zhao <soniczhao@gmail.com>
+Chuck Fossen <chuckf@cray.com>
 Dardo D Kleiner <dkleiner@cmf.nrl.navy.mil>
 Dave Goodell <dgoodell@cisco.com>
 Evgeny Leksikov <evgeny.leksikov@intel.com>
 Howard Pritchard <howardp@lanl.gov>
+James Shimek <jshimek@cray.com>
 Jeff Squyres <jsquyres@cisco.com>
 Jithin Jose <jithin.jose@intel.com>
 jose <jose@cst-fs.(none)>

diff --git a/COPYING b/COPYING
@@ -7,8 +7,8 @@ Some parts of the source are 3rd party code which uses MIT license.
 The description and requirements of the license are available in
 later part of this file.
 
-Copyright (c) 2015-2016 Intel Corporation.  All rights reserved.
-Copyright (c) 2016-2016 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2015-2017 Intel Corporation.  All rights reserved.
+Copyright (c) 2016-2017 Cisco Systems, Inc.  All rights reserved.
 
 ==================================================================