[ARVADOS] updated: 1.3.0-1099-g5c1c5e341

[Git user]

Summary of changes:
 doc/install/install-controller.html.textile.liquid |  16 ++
 lib/config/cmd.go                                  |   5 +-
 lib/config/cmd_test.go                             |   9 +-
 lib/config/config.default.yml                      | 105 +++++++---
 lib/config/export.go                               | 155 +++++++++++++++
 lib/config/export_test.go                          |  37 ++++
 lib/config/generated_config.go                     | 105 +++++++---
 lib/config/load_test.go                            |  18 ++
 lib/controller/federation_test.go                  |   8 +-
 lib/controller/handler.go                          |  15 ++
 lib/controller/handler_test.go                     |  21 +-
 lib/controller/server_test.go                      |   2 +-
 sdk/go/arvados/config.go                           | 212 ++++++++++++++++-----
 sdk/go/arvados/duration.go                         |   4 +-
 sdk/go/arvados/duration_test.go                    |  17 ++
 services/api/lib/config_loader.rb                  |  33 +++-
 16 files changed, 656 insertions(+), 106 deletions(-)
 create mode 100644 lib/config/export.go
 create mode 100644 lib/config/export_test.go

       via  5c1c5e34118a3867fca9e7f0150074ea18623939 (commit)
       via  d768d4e5b5b61949aeb2bb2e473c4ceec93957f1 (commit)
       via  38869cf0a55f5d41c150eb4a8591c693bda77daa (commit)
       via  3f45203069cda0b906ceeaf64d1ac8146a085895 (commit)
       via  6ab7efd23451b4c8f93f8a6b11028c5d8ce53ddc (commit)
       via  eaf26ebd285952ec6695270f0eda04ea7bf7e6c6 (commit)
       via  68211a7ead5f3cbe1a90b1b7769118a2b3543211 (commit)
       via  1034b2ada9bc1a63b63e094085d2851eb8846ae5 (commit)
       via  28ac7d4d181a0a9678099e579310d463c5057f06 (commit)
       via  e12c7f0bcb0f5cbe80a0274d1758c0dec57aa6e4 (commit)
       via  29bfdcc937816027c162071cc7044eb8e695ab4c (commit)
      from  5da148c4b88713680d19ef15e238e7b7a932e6f6 (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 5c1c5e34118a3867fca9e7f0150074ea18623939
Merge: 5da148c4b d768d4e5b
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Jun 14 14:28:49 2019 -0400

    Merge branch '15000-config-api'
    
    refs #15000
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --cc lib/config/cmd.go
index 858bfc2b2,39df4ec17..a41e4b033
--- a/lib/config/cmd.go
+++ b/lib/config/cmd.go
@@@ -13,8 -12,6 +13,7 @@@ import 
  	"os"
  	"os/exec"
  
- 	"git.curoverse.com/arvados.git/lib/cmd"
 +	"git.curoverse.com/arvados.git/sdk/go/arvados"
  	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
  	"github.com/ghodss/yaml"
  )
diff --cc lib/config/cmd_test.go
index d77003b47,fdcb6cc76..f2915a039
--- a/lib/config/cmd_test.go
+++ b/lib/config/cmd_test.go
@@@ -50,9 -57,9 +57,9 @@@ Clusters
    RequestLimits:
      MaxItemsPerResponse: 1234
  `
 -	code := CheckCommand.RunCommand("arvados config-check", nil, bytes.NewBufferString(in), &stdout, &stderr)
 +	code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr)
  	c.Check(code, check.Equals, 1)
- 	c.Check(stdout.String(), check.Matches, `(?ms).*API:\n\- +.*MaxItemsPerResponse: 1000\n\+ +MaxItemsPerResponse: 1234\n.*`)
+ 	c.Check(stdout.String(), check.Matches, `(?ms).*\n\- +.*MaxItemsPerResponse: 1000\n\+ +MaxItemsPerResponse: 1234\n.*`)
  }
  
  func (s *CommandSuite) TestCheckUnknownKey(c *check.C) {

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


hooks/post-receive
--