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.

Sign up for GitHub

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

Jump to bottom

[7.12] Add package settings and icon (#4542) #4795

Merged
merged 2 commits into from
Feb 18, 2021
Merged

[7.12] Add package settings and icon (#4542) #4795

merged 2 commits into from
Feb 18, 2021

Conversation

axw
Copy link
Member

@axw axw commented Feb 18, 2021

Backports the following commits to 7.x:

@jalvz @axw
Add package settings and icon (elastic#4542)
6c692dc 
# Conflicts:
#	apmpackage/apm/0.1.0/agent/input/template.yml.hbs
#	apmpackage/apm/0.1.0/docs/README.md
#	apmpackage/apm/0.1.0/manifest.yml
#	apmpackage/docs/README.template.md
@axw axw added the backport label Feb 18, 2021
@axw axw enabled auto-merge (squash) February 18, 2021 12:53
@apmmachine
Copy link
Contributor

apmmachine commented Feb 18, 2021 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #4795 updated

  • Start Time: 2021-02-18T15:47:43.591+0000

  • Duration: 33 min 17 sec

  • Commit: d8c2650

Test stats 🧪

Test Results
Failed 0
Passed 4373
Skipped 126
Total 4499

Trends 🧪

Image of Build Times

Image of Tests

Steps errors 3

Expand to view the steps failures

Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage
Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests
Test Sync
  • Took 3 min 11 sec . View more details on here
  • Description: ./.ci/scripts/sync.sh

@axw axw changed the base branch from 7.x to 7.12 February 18, 2021 15:45
@axw axw changed the title [7.x] Add package settings and icon (#4542) [7.12] Add package settings and icon (#4542) Feb 18, 2021
@axw axw merged commit fd7458b into elastic:7.12 Feb 18, 2021
axw added a commit to axw/apm-server that referenced this pull request Feb 19, 2021
@axw @jalvz
Add package settings and icon (elastic#4542) (elastic#4795)
fd2a840 
# Conflicts:
#	apmpackage/apm/0.1.0/agent/input/template.yml.hbs
#	apmpackage/apm/0.1.0/docs/README.md
#	apmpackage/apm/0.1.0/manifest.yml
#	apmpackage/docs/README.template.md

Co-authored-by: Juan Álvarez <[email protected]>
@axw axw mentioned this pull request Feb 19, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@axw @apmmachine @jalvz