Skip to content

Changes to --cert_chain_file param #89

Merged
merged 1 commit into from Apr 29, 2013

3 participants

@nikhilben

Here is the updated code. Changed '--cert_chain_file' to '--cert_file' . @skade & @stevegraham Please check if this can be merged.

@stevegraham
Owner

hey there, can you rebase my master branch against yours? I can't merge yours into my branch locally to run the tests :)

@nikhilben

Done 👍

@stevegraham
Owner

hey @nikhil. this now merges cleanly but the specs are not passing, specifically the ssl_integration_spec. can you investigate and rebase your commits into a single atomic commit for this pull request? thanks!

@nikhilben

Will have a look into this soon.

@nikhilben

@stevegraham I have a few changes, check if the specs are passing. I have no idea on building slanger from scratch - I wished if I could test my changes :). I have kept the actual '-- cert_chain_file' as it, but using '--cert_file' should work. Thanks.

@markburns
Collaborator

Also just to re-iterate what Stevie said, you need to squash these commits into a single commit:

http://stackoverflow.com/questions/5667884/how-to-squash-commits-in-git-after-they-have-been-pushed

@nikhilben

Thanks a ton @markburns . Will go through it.

@nikhilben nikhilben Changed certificate chain file param
Changed certificate chain file param

Changed certificate chain file param

Changed certificate chain file param

Changed to cert_file

added .idea to ignored entries
f8195a9
@markburns
Collaborator

Didn't notice you'd squashed these commits

@markburns markburns merged commit 4ae086c into stevegraham:master Apr 29, 2013
@stevegraham
Owner

He hadn't fixed the ssl_integration_spec problem at the time of last activity. This will probz need to be reverted. Will check later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.