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

Move Guide topic: kubelet Garbage Collection. #3301

Merged
merged 1 commit into from
Apr 10, 2017
Merged

Move Guide topic: kubelet Garbage Collection. #3301

merged 1 commit into from
Apr 10, 2017

Conversation

steveperry-53
Copy link
Contributor

@steveperry-53 steveperry-53 commented Apr 10, 2017

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 Apr 10, 2017
@pwittrock
Copy link
Member

failed netlify

@steveperry-53 steveperry-53 merged commit fe10be9 into kubernetes:master Apr 10, 2017
@steveperry-53 steveperry-53 deleted the garb branch April 10, 2017 23:12
chenopis added a commit that referenced this pull request Apr 11, 2017
…hub.io into migration-concepts-container-lifecycle-hooks

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (374 commits)
  Move Guide topic: ConfigMap. (#3333)
  Move Guide topic: H Pod Autoscaling Walkthrough. (#3332)
  Deprecation phase 2: kubefed. (#3331)
  Deprecation phase 2: admin/index ... (#3330)
  Deprecation phase 2: config-best-practices ... (#3328)
  Deprecation phase 2: container-environment ... (#3326)
  Deprecation phase 2: jobs (#3323)
  Deprecation phase 2: managing-deployments ... (#3309)
  Deprecation phase 2: kubectl binary_release ... (#3308)
  Improvements to kubernetes-basics/expose-intro.html (#3103)
  test/examples_test.go: validate docs/user-guide/pod-security-policy/psp.yaml (#3100)
  Move cron jobs to keep glossary in alphabetical order.
  Fix API server args
  Remove /redirects.rb (#3305)
  Move Guide topic: kubelet Garbage Collection. (#3301)
  Move Guide topic: Salt. (#3306)
  Fix tilte. (#3304)
  WIP: Cleanup /docs/contribute/ migration (#3278)
  Move Guide topic: HA Master. (#3303)
  Move Guide topic: Addons. (#3302)
  ...

# Conflicts:
#	docs/api-reference/apps/v1beta1/definitions.html
#	docs/api-reference/batch/v1/definitions.html
#	docs/concepts/containers/container-lifecycle-hooks.md
gyliu513 pushed a commit to gyliu513/kubernetes.github.io that referenced this pull request Apr 26, 2017
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.

4 participants