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

Merge remote-tracking branch 'origin/2.3' #3915

Merged
merged 62 commits into from Jul 16, 2018
Merged

Merge remote-tracking branch 'origin/2.3' #3915

merged 62 commits into from Jul 16, 2018

Conversation

sbrunner
Copy link
Member

No description provided.

sbrunner and others added 30 commits June 27, 2018 16:24
Be able to create a new project without extra internet access
Incrase the time for the short make
Alembic will use the same config file
Use p.wait instance of time.sleep
Add doc and target to edit the QGIS configuration file.
…l cert; add configuration to disable ssl cert for other http session creations by c2cgeoportal
To avoid too many errors when the DB is bounced and to have an optimal
number of connections possible.

https://jira.camptocamp.com/browse/GSGMF-501
…able

make checker work on non-standard environments (via parameterization)
Tune the sqlalchemy connections
jwkaltz and others added 22 commits July 5, 2018 08:16
Don't creates a route that ends with a slash
Some fix for qgisserver plugin
document new options for local http sessions (starting gmf 2.2.5)
Merge remote-tracking branch 'origin/2.2' into 2.3
@sbrunner sbrunner requested a review from fredj July 16, 2018 13:43
@sbrunner sbrunner added this to the dummy milestone Jul 16, 2018
@sbrunner sbrunner merged commit cbd4cd6 into master Jul 16, 2018
@sbrunner sbrunner deleted the merge23 branch July 16, 2018 14:21
sbrunner added a commit that referenced this pull request Jul 16, 2018
 Merge remote-tracking branch 'origin/2.3'
@sbrunner sbrunner modified the milestone: dummy Aug 3, 2018
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

4 participants