Skip to content
This repository was archived by the owner on Mar 24, 2026. It is now read-only.

Merging master fixes into round-14#2254

Merged
knewmanTE merged 85 commits intoround-14from
master
Sep 1, 2016
Merged

Merging master fixes into round-14#2254
knewmanTE merged 85 commits intoround-14from
master

Conversation

@NateBrady23
Copy link
Copy Markdown
Member

Merging master fixes into round-14

imalsogreg and others added 30 commits July 13, 2016 18:53
Fix syntax error in vagrant-aws setup script
Update versions in Node.js readme
You are using a debug setup.
The proposed changes should give some benefit
Make Colossus building a response object on each request
zapov and others added 24 commits August 29, 2016 22:39
Use simple loop instead of bulk reading for loading data N times from database.
Update dsl-compiler to latest version (to fix update permission).
Update Revenj.Java to 0.9.9 due to API change and sync with latest compiler.
This PR updates Finatra to 2.3.0 and also makes some minor changes:
- Set Finagle server defaults appropriately
- Set JVM args appropriately
Round 13 - Yesod with Postgres
…move gcc-4.9 and gcc-4.8 unneeded installation.
1. Fixed updates test to avoid lazy "for" that was not actually doing
the updates.
2. Cleaned up remaining code to match Compojure/http-kit implementation
as possible for easy diffing.
Also update Korma to match Compojure/http-kit.
Add Github Pull Request Template
Fold round-13 Branch into master
Disabled bulk reading for Revenj.
Fix clang installation and silicon tests, update LWAN.
@knewmanTE
Copy link
Copy Markdown
Contributor

My guess is this Travis run isn't going to tell us much, since it's basically just running the latest from master, but I think this should still be merged in because

  1. round-14 is a dev branch that needs to stay up to date

  2. we're reasonably happy with the stability of master at the moment.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.