Try to fix flakiness by increasing timeouts, because that is always the best way to perform such a fix.
Merge pull request #1606 from lavalamp/fix

Try to fix flakiness by increasing timeouts
Improve replication controller errro handling.
extend selector with EXISTS, new tests/some old tests use table-driven style; add Has to Labels interface; enforce Requirement restrictions in constructor
Add a flag-compatible wrapper for net.IPNet
Merge pull request #1609 from ddysher/fix-controller

Improve replication controller errro handling.
Fix hack/local-up-cluster.sh to ensure apiserver comes up
Merge pull request #951 from meirf/selector-string-form

extend selector with EXISTS, new tests/some old tests use table-driven style
Fix a problem with for loops, copy semantics and async routines.
Merge pull request #1614 from ghodss/fix_local_up_cluster

Fix hack/local-up-cluster.sh to ensure apiserver comes up
Merge pull request #1616 from brendandburns/kubelet

Fix a problem with for loops, copy semantics and async routines.
Merge pull request #1611 from thockin/netipnet

Add a flag-compatible wrapper for net.IPNet