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

Fix identify for WMS client with json format #9879

Merged
merged 2 commits into from
Apr 27, 2019

Conversation

elpaso
Copy link
Contributor

@elpaso elpaso commented Apr 26, 2019

Fix identify for WMS client with json format

Fixes #21735

Bonus track:
Respect number formatting in identify raster results

@elpaso elpaso added this to the 3.4.8 milestone Apr 26, 2019
@elpaso elpaso merged commit ffaa64e into qgis:master Apr 27, 2019
@elpaso elpaso deleted the bugfix-21735-gfi-json branch April 27, 2019 16:25
@backporting
Copy link
Contributor

backporting bot commented Apr 27, 2019

The backport to release-3_4 failed:

Commits ["c87833c807aed321f06e3cb4900315952b439398","a8844483d89fff54259dd12a8929954b57769d11"] could not be cherry-picked on top of release-3_4

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport release-3_4
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick c87833c807aed321f06e3cb4900315952b439398 a8844483d89fff54259dd12a8929954b57769d11
# Create a new branch with these backported commits.
git checkout -b backport-9879-to-release-3_4
# Push it to GitHub.
git push --set-upstream origin backport-9879-to-release-3_4
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is release-3_4 and the compare/head branch is backport-9879-to-release-3_4.

@backporting
Copy link
Contributor

backporting bot commented Apr 27, 2019

The backport to release-3_6 failed:

Commits ["c87833c807aed321f06e3cb4900315952b439398","a8844483d89fff54259dd12a8929954b57769d11"] could not be cherry-picked on top of release-3_6

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport release-3_6
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick c87833c807aed321f06e3cb4900315952b439398 a8844483d89fff54259dd12a8929954b57769d11
# Create a new branch with these backported commits.
git checkout -b backport-9879-to-release-3_6
# Push it to GitHub.
git push --set-upstream origin backport-9879-to-release-3_6
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is release-3_6 and the compare/head branch is backport-9879-to-release-3_6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant