search

hyperledger-archives / education

Hyperledger training material
https://wiki.hyperledger.org/display/LMDWG
Apache License 2.0
372 stars 360 forks source link

Add Chapter 2 contents (#45) #62

Closed nathalie-ckc closed 6 years ago

nathalie-ckc commented 6 years ago

Populate content from Chapter 2 of edX course.

Chapter 2 is Introduction to Hyperledger.

Signed-off-by: nathalie-ckc nathalie.ckc.123@gmail.com

tkuhrt commented 6 years ago

Thanks for the pull request, Nathalie. I will be reviewing this today.

nathalie-ckc commented 6 years ago

@tkuhrt I have made the requested changes & also rebased my branch to upstream/import-edx-content.

I'm not sure what happened with commit b48db7b (the most recent). I got a merge conflict with my origin branch... maybe because I was trying to avoid syncing my fork to commits 7d7c4f9 .. 9b79ea5 because I wasn't sure if they would be accepted or reverted. Anyway, I resolved the merge conflict and somehow I am now failing DCO, even though I used "git commit -s" and I see my sign-off line. :(

nathalie-ckc commented 6 years ago

Please refer to new pull request #70, which replaces this one. It's the same thing, including fixes for Tracy's feedback. However, it passes all the checks & the commits are squashed into one.

tkuhrt commented 6 years ago

Thanks, Nathalie. Reviewing that now.