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

Build: Upgrade grabpl to 2.4.2 #38820

Merged
merged 1 commit into from Sep 2, 2021

Conversation

malcolmholmes
Copy link
Contributor

Update grabpl, correcting the Windows installer license to AGPL.

@malcolmholmes malcolmholmes added type/ci Tasks related to Continuous Integration workflow old backport v8.1.x Mark PR for automatic backport to v8.1.x labels Sep 2, 2021
@malcolmholmes malcolmholmes merged commit b22c254 into main Sep 2, 2021
@malcolmholmes malcolmholmes deleted the malcolmholmes/update-to-grabpl-2.4.2 branch September 2, 2021 12:03
@grafanabot
Copy link
Contributor

The backport to v8.1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-38820-to-v8.1.x origin/v8.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b22c2543d04bfb463331aa0c2aaa99da2143d076
# Push it to GitHub
git push --set-upstream origin backport-38820-to-v8.1.x
git switch main
# Remove the local backport branch
git branch -D backport-38820-to-v8.1.x

Then, create a pull request where the base branch is v8.1.x and the compare/head branch is backport-38820-to-v8.1.x.

malcolmholmes added a commit that referenced this pull request Sep 2, 2021
malcolmholmes added a commit that referenced this pull request Sep 2, 2021
stevepostill pushed a commit to Reveal-International/grafana that referenced this pull request Nov 3, 2021
…-github to revdev

* commit '0d046c46b480ffc5fd602142a2b0e5dfc765b620': (63 commits)
  "Release: Updated versions in package to 8.1.3" (grafana#38965)
  Change grabpl version to 2.3.4 (grafana#38967)
  PieChart: Display "No data" when there is no data (grafana#38808) (grafana#38960)
  track signature files + add warn log (grafana#38938) (grafana#38958)
  Docs: Clarify delta value (grafana#38824) (grafana#38916)
  Postgres/MySQL/MSSQL: Fix region annotations not displayed correctly (grafana#38936) (grafana#38953)
  uPlot: Fix default value for plot legend visibility (grafana#36660) (grafana#38930)
  Prometheus: Fix validate selector in metrics browser (grafana#38921) (grafana#38926)
  Dashboard: Forces panel re-render when exiting panel edit (grafana#38913) (grafana#38919)
  [v8.1.x] Dashboard: Fix UIDs are not preserved when importing/creating dashboards thru importing .json file (grafana#38892)
  OAuth: add docs for disableAutoLogin param (grafana#38752) (grafana#38896)
  LibraryPanels: Prevents duplicate repeated panels from being created (grafana#38804) (grafana#38863)
  Adding missing information, more than just the manual backport. (grafana#38837)
  Elasticsearch: Prevent pipeline aggregations to show up in terms order by options (grafana#38448) (grafana#38830)
  Build: Upgrade grabpl to 2.4.2 (grafana#38820) (grafana#38828)
  Alerting: Fix alert flapping in the internal alertmanager (grafana#38648) (grafana#38829)
  [v8.1.x] Chore: Update to alpine:3.14.2 (grafana#38821)
  Update Dockerfile (grafana#38785) (grafana#38815)
  Deprecate browser access mode for the Graphite data source. (grafana#38783) (grafana#38809)
  Live: prepend orgId when publishing from HTTP (grafana#38775) (grafana#38793)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
old backport v8.1.x Mark PR for automatic backport to v8.1.x type/build-packaging type/ci Tasks related to Continuous Integration workflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants