Actually set repository QPS in the kubelet.
Fixes malformed OBJECT_URL in rackspace setup script
Fixes the minion yaml as well
Merge pull request #2869 from brendandburns/salt

Actually set repository QPS in the kubelet.
Merge pull request #2870 from zulily/fix-rackspace-cloud-files-url

Fixes malformed OBJECT_URL in rackspace setup script
Mention Fluentd in the logging doc, as originally requested by Kiyoto in
PR 2727.
Merge pull request #2879 from a-robinson/fluentd-pr

Mention Fluentd in the logging doc, as originally requested by Kiyoto in
Add Session Affinity details to service type to support sticky session load balancer.
run gofmt and add updates to tests to support new SessionAffinity type on ServiceSpec
Merge branch 'master' of https://github.com/foleymic/kubernetes

Conflicts:
	pkg/api/types.go