Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add map merge functionality #1500

Merged
merged 5 commits into from
Aug 12, 2021

Conversation

shovelwagon
Copy link
Contributor

Proposed code for enhancement in #1499.

@shovelwagon shovelwagon requested a review from a team August 5, 2021 17:32
@hashicorp-cla
Copy link

hashicorp-cla commented Aug 5, 2021

CLA assistant check
All committers have signed the CLA.

@shovelwagon
Copy link
Contributor Author

@eikenb, I was wondering if I could get a review. We're looking to move pretty quick with this new functionality.

Copy link
Member

@lornasong lornasong left a comment

Choose a reason for hiding this comment

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

Hi @shovelwagon, thanks for the PR! @eikenb is currently unavailable but will be around to review next week. I left a couple comments for minor nits that I noticed from an initial look but will leave it up to @eikenb!

docs/templating-language.md Outdated Show resolved Hide resolved
docs/templating-language.md Outdated Show resolved Hide resolved
docs/templating-language.md Outdated Show resolved Hide resolved
shovelwagon and others added 3 commits August 6, 2021 16:18
Co-authored-by: lornasong <lornasong@users.noreply.github.com>
Co-authored-by: lornasong <lornasong@users.noreply.github.com>
@shovelwagon
Copy link
Contributor Author

@lornasong, thanks for the initial review!

@shovelwagon
Copy link
Contributor Author

shovelwagon commented Aug 11, 2021

@eikenb, just wondering if there's anything you need from me? We're looking to get consul-template in our build pipeline within the next week and ideally we're not running on the fork.

@eikenb
Copy link
Contributor

eikenb commented Aug 12, 2021

Hey @shovelwagon,

I was going to wait until after I got 0.27 out to look at this but as it is a template function, so self contained, I'll take a look at it tomorrow while I'm waiting on some feedback on another PR (for 0.27).

@eikenb eikenb added the hashicat-update-required Changes that need to be ported to hashicat label Aug 12, 2021
@eikenb eikenb merged commit 85220a2 into hashicorp:master Aug 12, 2021
@eikenb eikenb added this to the 0.27.0 milestone Aug 12, 2021
@eikenb eikenb mentioned this pull request Aug 12, 2021
@shovelwagon
Copy link
Contributor Author

Thanks @eikenb!

@eikenb eikenb added the hashicat-update-complete Completed porting changes to hashicat label Nov 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement hashicat-update-complete Completed porting changes to hashicat hashicat-update-required Changes that need to be ported to hashicat
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants