Skip to content
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

tutorials/guestbook, tutorials/cassandra: import latest #4775

Merged
merged 2 commits into from
Aug 19, 2017
Merged

tutorials/guestbook, tutorials/cassandra: import latest #4775

merged 2 commits into from
Aug 19, 2017

Conversation

ahmetb
Copy link
Member

@ahmetb ahmetb commented Aug 11, 2017

Importing from kubernetes/examples repository.

/assign @cody-clark


This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 11, 2017
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Aug 11, 2017

Deploy preview ready!

Built with commit 9bc623c

https://deploy-preview-4775--kubernetes-io-master-staging.netlify.com

@chenopis
Copy link
Contributor

ping @cody-clark

@chenopis chenopis closed this Aug 14, 2017
@chenopis chenopis reopened this Aug 14, 2017
@ahmetb ahmetb changed the title tutorials/guestbook: fix broken links tutorials/guestbook, tutorials/cassandra: import latest Aug 14, 2017
@ahmetb
Copy link
Member Author

ahmetb commented Aug 14, 2017

I just updated this PR to import guestbook, as well as cassandra tutorials.

@cody-clark // to check the rendering
/assign @chenopis // to merge

@cody-clark
Copy link
Contributor

@chenopis Something weird is happening for the .yaml excerpt on line 192. It renders fine in the Github Preview and in my own Github Pages site, but becomes a codeblock paragraph in the Netlify preview.

@ahmetb
Copy link
Member Author

ahmetb commented Aug 15, 2017

Try with 2, 4, 6, 8 spaces of indentation. One of them should work. I can update the commit if you find a solution. If it doesn't work we can revert back to HTML, or just destroy the numbered list.

I promise I'll bring the tutorial contents back here soon so we don't have to go through this import dance again.

@chenopis
Copy link
Contributor

@cody-clark Yeah, you might want to try 8 spaces. Also, check to see how many spaces are in front of {: .note}. If it's only 3, then try making it 4.

Have I mentioned lately that I hate markdown? LOL

@cody-clark
Copy link
Contributor

@chenopis @ahmetb Any strong opinions against just deleting the excerpt? It doesn't really add to the documentation and it's blocking some important updates like working download links.

Or we could merge this and fix the block when this repo is independent and trial and error checking is more forgiving.

And I love that Markdown's consistently inconsistent :) It adds a new dimension to "no two days are the same." :')

@jaredbhatti
Copy link
Contributor

@cody-clark I suggest deleting the excerpt or just removing the "note:" callout field and leaving the text.

@ahmetb
Copy link
Member Author

ahmetb commented Aug 18, 2017

It's a minor rendering issue I think we can fix separately after merging if no objections.

@cody-clark
Copy link
Contributor

@chenopis LGTM

@chenopis
Copy link
Contributor

@ahmetb Ok, let's fix the md rending issue in a different PR. /lgtm

@chenopis
Copy link
Contributor

@ahmetb Can you fix the merge conflict?

ahmetb added 2 commits August 18, 2017 15:10
Importing from kubernetes/examples repository.

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
@ahmetb
Copy link
Member Author

ahmetb commented Aug 18, 2017

Done

@chenopis chenopis merged commit acff658 into kubernetes:master Aug 19, 2017
@mbssaiakhil mbssaiakhil mentioned this pull request Aug 20, 2017
jesscodez pushed a commit that referenced this pull request Sep 22, 2017
* tutorials/guestbook: fix broken links

Importing from kubernetes/examples repository.

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>

* Import newer versions for guestbook and cassandra

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants