Skip to content

Initial cherry-picks for 1.4.3#8121

Merged
zjs merged 6 commits intovmware:releases/1.4.3from
zjs:releases/1.4.2
Jul 27, 2018
Merged

Initial cherry-picks for 1.4.3#8121
zjs merged 6 commits intovmware:releases/1.4.3from
zjs:releases/1.4.2

Conversation

@zjs
Copy link
Member

@zjs zjs commented Jul 3, 2018 •
edited
Loading

Cherry-pick:

@zjs zjs self-assigned this Jul 3, 2018
@zjs zjs requested review from hickeng, lcastellano and sflxn July 3, 2018 15:21
hickeng
hickeng reviewed Jul 10, 2018
View reviewed changes
Copy link
Contributor

@hickeng hickeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to drop one of the cherry picks:

session: Note operations which omit UserAgent (ff1db6e from #7887)

and instead add in the relevant pieces of #6943 - I'd rather not have a single release that has different naming.

hickeng
hickeng previously requested changes Jul 10, 2018
View reviewed changes
Copy link
Contributor

@hickeng hickeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#6943 tweaks.

@zjs zjs force-pushed the releases/1.4.2 branch from 7479579 to d09c7bb Compare July 12, 2018 17:30
@zjs zjs dismissed hickeng’s stale review July 12, 2018 17:31

Removed "session: Note operations which omit UserAgent"

@zjs zjs changed the base branch from releases/1.4.2 to releases/1.4.3 July 19, 2018 06:56
@zjs zjs changed the title Initial cherry-picks for 1.4.2 Initial cherry-picks for 1.4.3 Jul 19, 2018
zjs added 6 commits July 26, 2018 18:00
@zjs
Clarify rollback log output (vmware#7830) (vmware#8121)
fc9589e 
When rolling back an upgrade, clearly log that we are doing so.

(cherry picked from commit 2c4dde9)
@zjs
Remove mention of container store from log (vmware#7829) (vmware#8121)
b92f157 
The --container-store option was removed in 1.3. Remove a lingering
mention of it from a log message.

(cherry picked from commit 05c3127)
@zjs
Output VCH ID in create and inspect (vmware#7832) (vmware#8121)
8b60873 
Allow users to take note of the VCH endpoint VM's ID for debugging or
use with subsequent vic-machine commands.

Additionally, output the management IP.

(cherry picked from commit 696cb97)
@zjs
Clarify usage string for vic-machine update (vmware#7846) (vmware#8121)
bc29194 
To help users understand the difference between update and configure,
clarify that update is used to modify the infrastructure, not a VCH.

(cherry picked from commit 0f3106b)
@zjs
Support shell completion in vic-machine (vmware#7785) (vmware#8121)
5ce4acc 
Implement a cli.BashCompleteFunc factory and use it to supply an
appropriate instance with each cli.Command in vic-machine.

Package bash and zsh completion scripts for use by users.

(cherry picked from commit 26ee2f9)
@zjs
vic-machine: Fix message from inspect config (vmware#7544) (vmware#8121)
99579cd 
The `vic-machine inspect config` command describes the current state
of the target VCH. When this command was implemented, this was
equivalent to the options used to create the VCH. Since then, the
`vic-machine configure` command has been added. This change corrects
the phrasing of the message to clearly communicate that the output is
the current state of the VCH, not the initial creation options.

(cherry picked from commit 7662397)
@zjs zjs force-pushed the releases/1.4.2 branch from d09c7bb to 99579cd Compare July 27, 2018 01:01
@zjs zjs merged commit 36b5ac2 into vmware:releases/1.4.3 Jul 27, 2018
zjs added a commit that referenced this pull request Jul 27, 2018
@zjs
Clarify rollback log output (#7830) (#8121)
68fd506 
When rolling back an upgrade, clearly log that we are doing so.

(cherry picked from commit 2c4dde9)
zjs added a commit that referenced this pull request Jul 27, 2018
@zjs
Remove mention of container store from log (#7829) (#8121)
f1d1b73 
The --container-store option was removed in 1.3. Remove a lingering
mention of it from a log message.

(cherry picked from commit 05c3127)
zjs added a commit that referenced this pull request Jul 27, 2018
@zjs
Output VCH ID in create and inspect (#7832) (#8121)
556fa2d 
Allow users to take note of the VCH endpoint VM's ID for debugging or
use with subsequent vic-machine commands.

Additionally, output the management IP.

(cherry picked from commit 696cb97)
zjs added a commit that referenced this pull request Jul 27, 2018
@zjs
Clarify usage string for vic-machine update (#7846) (#8121)
37117b4 
To help users understand the difference between update and configure,
clarify that update is used to modify the infrastructure, not a VCH.

(cherry picked from commit 0f3106b)
zjs added a commit that referenced this pull request Jul 27, 2018
@zjs
Support shell completion in vic-machine (#7785) (#8121)
d4f32a4 
Implement a cli.BashCompleteFunc factory and use it to supply an
appropriate instance with each cli.Command in vic-machine.

Package bash and zsh completion scripts for use by users.

(cherry picked from commit 26ee2f9)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sflxn sflxn Awaiting requested review from sflxn

@lcastellano lcastellano Awaiting requested review from lcastellano

1 more reviewer

@hickeng hickeng hickeng approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@zjs zjs

Labels

cla-not-required

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@zjs @hickeng @vmwclabot