[ARVADOS] updated: 2.1.0-742-gf5e60e18f

[Git user]

Summary of changes:
 go.mod                 |  1 +
 go.sum                 |  2 ++
 lib/config/cmd.go      | 27 +++-------------------
 lib/config/cmd_test.go | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/config/load.go     |  8 +++++--
 5 files changed, 75 insertions(+), 26 deletions(-)

       via  f5e60e18f701e135e0721307130d0acf6c7da183 (commit)
       via  7eccf2d2d8d45b5b6f10ba6cf123cba1cc90e4e3 (commit)
       via  727c8c37baa64fe63bec04aacea870ea47a7daf0 (commit)
      from  90639f0e5d620b660a3f94d89682b57335b5a0ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f5e60e18f701e135e0721307130d0acf6c7da183
Merge: 90639f0e5 7eccf2d2d
Author: Tom Clegg <tom at curii.com>
Date:   Wed Apr 28 11:31:06 2021 -0400

    Merge branch '16997-sort-config-for-diff'
    
    fixes #16997
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


-----------------------------------------------------------------------


hooks/post-receive
--