Add configurable sleep between polling intervals for GCE status
Merge branch 'master' of github.com:GoogleCloudPlatform/kubernetes into configurable-sleep-interval
Add an integration test for services.
Add a caching layer, so we don't pound cloud providers for ip addresses.
Add a signal handler to pause.

It returns 0 when a signal is received.
Merge pull request #1560 from brendandburns/scheduler

Add a caching layer, so we don't pound cloud providers for ip addresses.
Merge pull request #1563 from vmarmol/master

Add a signal handler to pause.
Merge pull request #1559 from brendandburns/fix

Add an integration test for services.
Merge pull request #1544 from justinlindh/configurable-sleep-interval

Add configurable sleep between polling intervals for GCE status
Salt specification for adding fluentd to each node.
Example of how to use fluentd to ELK for log collection and analysis.
Update README.md with TODO.
Modify fluentd config to add the Docker container ID to the log message tag.
Merge branch 'master' of github.com:satnam6502/kubernetes

Conflicts:
	contrib/logging/fluentd-elasticsearch/td-agent.conf