Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Provides CORS support to Scassandra Endpoints #167
PR based on #162
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