From 219e67d9e0def6bc6a266d6a4720b613073f6225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Pawe=C5=82=20G=C5=82azik?= Date: Sat, 12 Dec 2015 13:39:16 +0100 Subject: [PATCH 1/6] Sort output of agent-info --- command/agent_info.go | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/command/agent_info.go b/command/agent_info.go index a36d83539..abf83c4f8 100644 --- a/command/agent_info.go +++ b/command/agent_info.go @@ -2,6 +2,7 @@ package command import ( "fmt" + "sort" "strings" ) @@ -53,14 +54,26 @@ func (c *AgentInfoCommand) Run(args []string) int { return 1 } + // Sort and output agent info var stats map[string]interface{} stats, _ = info["stats"] + stats_keys := make([]string, 0, len(stats)) + for key := range stats { + stats_keys = append(stats_keys, key) + } + sort.Strings(stats_keys) - for section, data := range stats { - c.Ui.Output(section) - d, _ := data.(map[string]interface{}) - for k, v := range d { - c.Ui.Output(fmt.Sprintf(" %s = %v", k, v)) + for _, key := range stats_keys { + c.Ui.Output(key) + d, _ := stats[key].(map[string]interface{}) + d_keys := make([]string, 0, len(d)) + for key := range d { + d_keys = append(d_keys, key) + } + sort.Strings(d_keys) + + for _, key := range d_keys { + c.Ui.Output(fmt.Sprintf(" %s = %v", key, d[key])) } } From 8e2633d81c539793a752ffd80d532c46ab53c0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Pawe=C5=82=20G=C5=82azik?= Date: Thu, 17 Dec 2015 23:53:33 +0100 Subject: [PATCH 2/6] small refactor --- command/agent_info.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/command/agent_info.go b/command/agent_info.go index abf83c4f8..c4b290787 100644 --- a/command/agent_info.go +++ b/command/agent_info.go @@ -57,23 +57,23 @@ func (c *AgentInfoCommand) Run(args []string) int { // Sort and output agent info var stats map[string]interface{} stats, _ = info["stats"] - stats_keys := make([]string, 0, len(stats)) + statsKeys := make([]string, 0, len(stats)) for key := range stats { - stats_keys = append(stats_keys, key) + statsKeys = append(statsKeys, key) } - sort.Strings(stats_keys) + sort.Strings(statsKeys) - for _, key := range stats_keys { + for _, key := range statsKeys { c.Ui.Output(key) - d, _ := stats[key].(map[string]interface{}) - d_keys := make([]string, 0, len(d)) - for key := range d { - d_keys = append(d_keys, key) + statsData, _ := stats[key].(map[string]interface{}) + statsDataKeys := make([]string, 0, len(statsData)) + for key := range statsData { + statsDataKeys = append(statsDataKeys, key) } - sort.Strings(d_keys) + sort.Strings(statsDataKeys) - for _, key := range d_keys { - c.Ui.Output(fmt.Sprintf(" %s = %v", key, d[key])) + for _, key := range statsDataKeys { + c.Ui.Output(fmt.Sprintf(" %s = %v", key, statsData[key])) } } From c34d0be6ec5bae9fd4319e1bb0fa62232268afe6 Mon Sep 17 00:00:00 2001 From: captainill Date: Sat, 19 Dec 2015 21:13:00 -0800 Subject: [PATCH 3/6] Hashicorp with capitol C in header --- .../source/assets/stylesheets/_header.scss | 6 ++-- .../hashicorp-shared/_hashicorp-header.scss | 6 +--- .../source/layouts/svg/_svg-by-hashicorp.erb | 29 +++++++++---------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/website/source/assets/stylesheets/_header.scss b/website/source/assets/stylesheets/_header.scss index 5bca1464a..e47db98c5 100755 --- a/website/source/assets/stylesheets/_header.scss +++ b/website/source/assets/stylesheets/_header.scss @@ -22,14 +22,14 @@ .by{ &:hover{ svg{ - line{ - stroke: $green-dark; + .svg-bg-line{ + fill: $green-dark; } } } } } - + .buttons{ margin-top: 2px; //baseline everything diff --git a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss index c9bc593b6..8ab6d99db 100755 --- a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss +++ b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss @@ -26,9 +26,6 @@ polygon{ fill: white; } - line{ - stroke: white; - } } } } @@ -131,8 +128,7 @@ @include transition(all 300ms ease-in); } } - line{ - stroke: black; + .svg-bg-line{ @include transition(all 300ms ease-in); &:hover{ diff --git a/website/source/layouts/svg/_svg-by-hashicorp.erb b/website/source/layouts/svg/_svg-by-hashicorp.erb index d89929590..607d16b1e 100644 --- a/website/source/layouts/svg/_svg-by-hashicorp.erb +++ b/website/source/layouts/svg/_svg-by-hashicorp.erb @@ -1,18 +1,17 @@ - - + - - - - - - - - - + + + + + + + + + + + + + - - From 5751e1b6e0ffea5f30bf317deaad36cbcedb293d Mon Sep 17 00:00:00 2001 From: captainill Date: Sun, 20 Dec 2015 12:22:10 -0800 Subject: [PATCH 4/6] clean up footer --- website/source/assets/stylesheets/_footer.scss | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/website/source/assets/stylesheets/_footer.scss b/website/source/assets/stylesheets/_footer.scss index 468939219..46060f53e 100644 --- a/website/source/assets/stylesheets/_footer.scss +++ b/website/source/assets/stylesheets/_footer.scss @@ -53,10 +53,8 @@ body.page-sub{ &:hover{ svg{ - &.svg-by{ - line{ - stroke: $green-dark; - } + .svg-bg-line{ + fill: $green-dark; } } } @@ -95,6 +93,14 @@ body.page-sub{ @include transition(all 300ms ease-in); } } + + .svg-bg-line{ + @include transition(all 300ms ease-in); + + &:hover{ + @include transition(all 300ms ease-in); + } + } } } } From dff2460d031827ea6ce3675542a6ada1d396efd2 Mon Sep 17 00:00:00 2001 From: Chris Hines Date: Mon, 21 Dec 2015 10:43:45 -0500 Subject: [PATCH 5/6] Allow for low precision time.Now on Windows. --- client/restarts_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/restarts_test.go b/client/restarts_test.go index 79e4d2a56..4c84193c5 100644 --- a/client/restarts_test.go +++ b/client/restarts_test.go @@ -44,8 +44,8 @@ func TestClient_RestartTracker_ModeDelay(t *testing.T) { if !actual { t.Fail() } - if !(when > p.Delay && when < p.Interval) { - t.Fatalf("NextRestart() returned %v; want less than %v and more than %v", when, p.Interval, p.Delay) + if !(when > p.Delay && when <= p.Interval) { + t.Fatalf("NextRestart() returned %v; want > %v and <= %v", when, p.Delay, p.Interval) } } } From c8a25c6a8b55e330b270496641af1ddf5734db03 Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Mon, 21 Dec 2015 15:10:49 -0800 Subject: [PATCH 6/6] Fix append issue --- command/agent_info.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/command/agent_info.go b/command/agent_info.go index c4b290787..98231df9f 100644 --- a/command/agent_info.go +++ b/command/agent_info.go @@ -66,9 +66,11 @@ func (c *AgentInfoCommand) Run(args []string) int { for _, key := range statsKeys { c.Ui.Output(key) statsData, _ := stats[key].(map[string]interface{}) - statsDataKeys := make([]string, 0, len(statsData)) + statsDataKeys := make([]string, len(statsData)) + i := 0 for key := range statsData { - statsDataKeys = append(statsDataKeys, key) + statsDataKeys[i] = key + i++ } sort.Strings(statsDataKeys)