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

[Fixes #5073] Update install docs #5074

Merged
merged 2 commits into from
Oct 20, 2019
Merged

[Fixes #5073] Update install docs #5074

merged 2 commits into from
Oct 20, 2019

Conversation

t-book
Copy link
Contributor

@t-book t-book commented Oct 19, 2019

  • Correct Tomcat Version
  • Fix gzip compression for js

Fixes #5073
Closes #5073

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemptions is, changes not visible to end users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there are explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Oct 19, 2019
@t-book t-book self-assigned this Oct 19, 2019
@t-book t-book added the docs Issues addressing correction or improvement of documentation label Oct 19, 2019
@t-book t-book added this to the 2.10.1 milestone Oct 19, 2019
@codecov
Copy link

codecov bot commented Oct 19, 2019

Codecov Report

Merging #5074 into master will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff           @@
##           master   #5074   +/-   ##
======================================
  Coverage    59.6%   59.6%           
======================================
  Files         139     139           
  Lines       14129   14129           
  Branches     2147    2147           
======================================
  Hits         8422    8422           
  Misses       4983    4983           
  Partials      724     724

@afabiani afabiani merged commit 4eb269e into master Oct 20, 2019
@backporting
Copy link

backporting bot commented Oct 20, 2019

The backport to 2.10.x failed:

Commits ["17cc5c767a4df811539e47395db0bbfd4e6fde03","0bb703c93dc2f4b8ef289b31e75c00b7736d48f1"] could not be cherry-picked on top of 2.10.x

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 2.10.x
# 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 17cc5c767a4df811539e47395db0bbfd4e6fde03 0bb703c93dc2f4b8ef289b31e75c00b7736d48f1
# Create a new branch with these backported commits.
git checkout -b backport-5074-to-2.10.x
# Push it to GitHub.
git push --set-upstream origin backport-5074-to-2.10.x
# 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 2.10.x and the compare/head branch is backport-5074-to-2.10.x.

@afabiani afabiani deleted the t-book-patch-2 branch October 20, 2019 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed CLA Bot: community license agreement signed docs Issues addressing correction or improvement of documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update install docs
2 participants