Repository: incubator-slider Updated Branches: refs/heads/develop b97a86113 -> 495901581
SLIDER-780 Support for Docker based application packaging in Slider - add missing license headers (Thomas Liu via gourksaha) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/49590158 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/49590158 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/49590158 Branch: refs/heads/develop Commit: 49590158167d2dafc96728e7ae007911f8aa12cd Parents: b97a861 Author: Gour Saha <[email protected]> Authored: Mon May 4 22:16:04 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Mon May 4 22:16:04 2015 -0700 ---------------------------------------------------------------------- .../src/main/python/agent/DockerManager.py | 22 +++++++++++++++++++- .../metadata/DockerContainerInputFile.java | 20 +++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/49590158/slider-agent/src/main/python/agent/DockerManager.py ---------------------------------------------------------------------- diff --git a/slider-agent/src/main/python/agent/DockerManager.py b/slider-agent/src/main/python/agent/DockerManager.py index 7cab24c..645622c 100644 --- a/slider-agent/src/main/python/agent/DockerManager.py +++ b/slider-agent/src/main/python/agent/DockerManager.py @@ -1,3 +1,23 @@ +#!/usr/bin/env python + +''' +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +''' + import logging import os import subprocess @@ -187,4 +207,4 @@ class DockerManager(): code, out, err = self.execute_command_on_linux(docker_command) logger.info("output: " + str(out)) - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/49590158/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/DockerContainerInputFile.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/DockerContainerInputFile.java b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/DockerContainerInputFile.java index fa6eacb..0faceb9 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/DockerContainerInputFile.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/DockerContainerInputFile.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.slider.providers.agent.application.metadata; import org.slf4j.Logger; @@ -29,4 +47,4 @@ public class DockerContainerInputFile { this.fileLocalPath = fileLocalPath; } -} \ No newline at end of file +}
