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

Provides CORS support to Scassandra Endpoints #167

Merged
merged 1 commit into from Jul 19, 2016

Conversation

Projects
None yet
2 participants
@jpinho
Contributor

jpinho commented Jul 19, 2016

  • Adds trait mixin to enable CORS on a given path
  • Adds CORS support for /current endpoint
  • Adds config to disable/enable CORS support application-wide
  • Adds functional tests to CorsSupport class
  • Adds copyright headers
  • Adding CORS to all endpoints and also moving CORS config to
    application.conf
  • Adding MethodRejection for preflight with CORS off and log improvement

PR based on #162

Provides CORS support to Scassandra Endpoints
- Adds trait mixin to enable CORS on a given path
- Adds CORS support for /current endpoint
- Adds config to disable/enable CORS support application-wide
- Adds functional tests to CorsSupport class
- Adds copyright headers
- Adding CORS to all endpoints and also moving CORS config to
  application.conf
- Adding MethodRejection for preflight with CORS off and log improvement

Adding MethodRejection for preflight with CORS off and log improvement
@jpinho

This comment has been minimized.

Show comment
Hide comment
@jpinho

jpinho Jul 19, 2016

Contributor

Hi @tolbertam, this rebase/squash gave some extra work, because I performed a merge back ( merge from scassandra/master into my master ) before, and then applied some commits on top of that, and after that you also added commits to the main repo, so in terms of history things got a little messed up.

So basically I cherry picked all my stuff to a separate branch, and committed the changes into 1 commit, push forced my HEAD to the start point, i.e, the previous commit of my first contribution. Then rebased my master with yours, updating my master in fast-forward mode (no commits), and only after that I cherry-picked my commit—with all my changes, —on top of everything. All clean now :) !!!

I also run ./gradle clean check and everything went OK! I think this is ready to merge, lets wait for Travis to give us a Green OK too!

Contributor

jpinho commented Jul 19, 2016

Hi @tolbertam, this rebase/squash gave some extra work, because I performed a merge back ( merge from scassandra/master into my master ) before, and then applied some commits on top of that, and after that you also added commits to the main repo, so in terms of history things got a little messed up.

So basically I cherry picked all my stuff to a separate branch, and committed the changes into 1 commit, push forced my HEAD to the start point, i.e, the previous commit of my first contribution. Then rebased my master with yours, updating my master in fast-forward mode (no commits), and only after that I cherry-picked my commit—with all my changes, —on top of everything. All clean now :) !!!

I also run ./gradle clean check and everything went OK! I think this is ready to merge, lets wait for Travis to give us a Green OK too!

@tolbertam

This comment has been minimized.

Show comment
Hide comment
@tolbertam

tolbertam Jul 19, 2016

Contributor

Thanks for taking care of that @jpinho! I appreciate you working through getting the commit history in good shape :). This looks perfect, thanks!

Contributor

tolbertam commented Jul 19, 2016

Thanks for taking care of that @jpinho! I appreciate you working through getting the commit history in good shape :). This looks perfect, thanks!

@tolbertam tolbertam merged commit 1c865cf into scassandra:master Jul 19, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment