diff --git a/config/config.go b/config/config.go index ad3d03197..f5e7671b0 100644 --- a/config/config.go +++ b/config/config.go @@ -16,7 +16,7 @@ type VolumeType string const ( /* Misc. orchestrator constants */ OrchestratorName = "trident" - orchestratorVersion = "17.10.0" + orchestratorVersion = "17.10.1" OrchestratorAPIVersion = "1" PersistentStoreTimeout = 60 * time.Second MaxBootstrapAttempts = 10 diff --git a/frontend/rest/apiserver.go b/frontend/rest/apiserver.go index e1c66a314..dfb00a223 100644 --- a/frontend/rest/apiserver.go +++ b/frontend/rest/apiserver.go @@ -12,7 +12,7 @@ import ( "github.com/netapp/trident/core" ) -const httpTimeout = 10 * time.Second +const httpTimeout = 30 * time.Second var orchestrator core.Orchestrator diff --git a/glide.lock b/glide.lock index eb219cd58..be56eff26 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 624fdd174bedc96f5bef0226a31e38c4077bf493dc553d14f54d422fc6c9d8ff -updated: 2017-10-17T16:16:22.8861239-04:00 +hash: 8d1d976e7f24147822984b095f1914b34ed7d2683bbc57fbca0295fcc0193a9f +updated: 2017-11-09T13:52:10.606421629-05:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -96,7 +96,7 @@ imports: - name: github.com/mattn/go-runewidth version: 14207d285c6c197daabb5c9793d63e7af9ab2d50 - name: github.com/netapp/netappdvp - version: a93463d46ae59acabd4cb68f95d74879be9c3701 + version: c6c608f6b499523388ef576ed502571701790a9a subpackages: - apis/eseries - apis/ontap diff --git a/glide.yaml b/glide.yaml index 10499adba..2d9deef89 100644 --- a/glide.yaml +++ b/glide.yaml @@ -93,7 +93,7 @@ import: - jlexer - jwriter - package: github.com/netapp/netappdvp - version: a93463d46ae59acabd4cb68f95d74879be9c3701 + version: c6c608f6b499523388ef576ed502571701790a9a subpackages: - apis/eseries - apis/ontap @@ -318,3 +318,7 @@ import: version: f38e43b221d08850172a9a4ea785a86a3ffa3b3a subpackages: - pkg/util/version +- package: github.com/dustin/go-humanize + version: 259d2a102b871d17f30e3cd9881a642961a1e486 +- package: github.com/olekukonko/tablewriter + version: febf2d34b54a69ce7530036c7503b1c9fbfdf0bb