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

Master merged 2 #264

Merged
merged 18 commits into from
Jun 12, 2017
Merged

Conversation

lucernae
Copy link
Collaborator

@lucernae lucernae commented Jun 12, 2017

Regular update from geonode/master

afabiani and others added 18 commits June 7, 2017 15:27
…updated version of DJango too

 - Fix for ISSUE GeoNode#3110: Django Outh2 updated version requires updated version of DJango too
 - Fix for ISSUE GeoNode#3110: Django Outh2 updated version requires updated…
Correct comment spelling
…-fixtures-order

Fix for ISSUE GeoNode#2989: backup/restore: order of fixtures
Gracefully handle non-JSON response from restore REST API
…-restore-dir

For for ISSUE GeoNode#2988: restore command: allow work with unpacked data
Fix for ISSUE GeoNode#2983: backup/restore gracefully handle non-json responses from geoserver backup api
…-skip-geoserver-backup

Fix for ISSUE GeoNode#2985: Backup/Restore skip geoserver operations switch in cli
…-allow-customized-settings-path

Fix for ISSSUE GeoNode#2984: backup/restore allow customized settings.ini path
@codecov
Copy link

codecov bot commented Jun 12, 2017

Codecov Report

Merging #264 into master-qgis_server will decrease coverage by 0.17%.
The diff coverage is 0%.

Impacted file tree graph

@@                  Coverage Diff                   @@
##           master-qgis_server     #264      +/-   ##
======================================================
- Coverage               45.95%   45.78%   -0.18%     
======================================================
  Files                     256      256              
  Lines                   18527    18599      +72     
  Branches                 2440     2449       +9     
======================================================
  Hits                     8515     8515              
- Misses                   9525     9597      +72     
  Partials                  487      487
Impacted Files Coverage Δ
geonode/base/management/commands/helpers.py 0% <0%> (ø) ⬆️
geonode/base/management/commands/backup.py 0% <0%> (ø) ⬆️
geonode/base/management/commands/restore.py 0% <0%> (ø) ⬆️
geonode/base/management/commands/migrate_layers.py 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5ca7a14...c54707c. Read the comment docs.

@lucernae lucernae merged commit 9c7970b into kartoza:master-qgis_server Jun 12, 2017
@lucernae lucernae deleted the master-merged-2 branch June 12, 2017 14:23
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.

2 participants