Merge pull request #8882 from mesosphere/upstream_k8sm

Upstream Kubernetes-Mesos framework
This commit is contained in:
Abhi Shah
2015-06-12 06:36:20 -07:00
160 changed files with 23986 additions and 27 deletions

View File

@@ -16,6 +16,9 @@ limitations under the License.
package kubelet
// Note: if you change code in this file, you might need to change code in
// contrib/mesos/pkg/executor/.
import (
"errors"
"fmt"