Andrew Chen cb9cff59db Review conflicts from 1.6-release/master merges

2017-04-20 10:52:04 -07:00

..

cron-jobs.md

Move Jobs under Controllers. (#3453)

2017-04-18 20:04:48 -07:00

cronjob.yaml

Move Jobs under Controllers. (#3453)

2017-04-18 20:04:48 -07:00

daemonset.md

Update User Guide and Admin links to point to new resources. (#3438)

2017-04-19 10:56:47 -07:00

deployment.md

Update User Guide and Admin links to point to new resources. (#3438)

2017-04-19 10:56:47 -07:00

frontend.yaml

Move Guide topic Replica Sets. (#3180)

2017-03-31 13:10:28 -07:00

garbage-collection.md

Update garbage-collection.md

2017-03-26 18:25:03 -07:00

hpa-rs.yaml

Move Guide topic Replica Sets. (#3180)

2017-03-31 13:10:28 -07:00

job.yaml

Move Jobs under Controllers. (#3453)

2017-04-18 20:04:48 -07:00

jobs-run-to-completion.md

Review conflicts from 1.6-release/master merges

2017-04-20 10:52:04 -07:00

my-repset.yaml

Move Garbage Collection topic. (#2874)

2017-03-16 13:58:07 -07:00

nginx-deployment.yaml

Move Guide topic: Deployments (#3179)

2017-03-31 12:13:47 -07:00

petset.md

Update User Guide and Admin links to point to new resources. (#3438)

2017-04-19 10:56:47 -07:00

petset.yaml

Move Guide topic: Pet Set. (#3188)

2017-03-31 16:00:55 -07:00

replicaset.md

Update User Guide and Admin links to point to new resources. (#3438)

2017-04-19 10:56:47 -07:00

replication.yaml

Move Guide topic: Replication Controller. (#3203)

2017-04-03 10:23:03 -07:00

replicationcontroller.md

Update User Guide and Admin links to point to new resources. (#3438)

2017-04-19 10:56:47 -07:00

statefulset.md

Update User Guide and Admin links to point to new resources. (#3438)

2017-04-19 10:56:47 -07:00