Fix crash (loop?) in kubelet
Update README to match with json files and remove duplicate index.php
Fix typo.
Merge pull request #2506 from komljen/master

Update guestbook example README page with latest json file changes
Merge pull request #2519 from erictune/channel_api

Fix typo.
Merge pull request #2513 from lavalamp/verifyNetwork

Fix crash (loop?) in kubelet
Refactor PodCondition to PodPhase
Rename makeContainerKey -> make BoundPodsKey.

Fix some typos too.
Add helper for making simple selector.
Merge pull request #2522 from markturansky/v1beta3_podphaserefactor

Refactor PodCondition to PodPhase
Merge pull request #2525 from erictune/cleanup1

Rename makeContainerKey -> make BoundPodsKey.
Merge pull request #2526 from erictune/addhelper

Add selector making helper
Fix 32bit build
Remove never-needed return value.

Make some types private.
Fix pointers in AWS CloudFormation template
Add a note indicating breakage in these configs.
Enable docker registry cache. By default it is off
Merge pull request #2527 from erictune/cleanup2

Remove unused return value.  Make stuff private.
kubectl get format is specified with -o, not -f
Increase the verbosit of integration test runs.