Repository: cloudstack Updated Branches: refs/heads/master db9de2e39 -> f57f22a79
Fixed few Licensing Issues Added licensing information to files Signed-off-by: Santhosh Edukulla <santhosh.eduku...@citrix.com> Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f57f22a7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f57f22a7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f57f22a7 Branch: refs/heads/master Commit: f57f22a79e2b7c0b7ab14d5cf5e33f109ad525c3 Parents: db9de2e Author: Santhosh Edukulla <santhosh.eduku...@citrix.com> Authored: Thu Apr 24 06:10:56 2014 +0530 Committer: SrikanteswaraRao Talluri <tall...@apache.org> Committed: Thu Apr 24 12:16:49 2014 +0530 ---------------------------------------------------------------------- test/integration/component/test_escalations.py | 19 ++++++++++++++++++- tools/marvin/marvin/config/__init__.py | 16 ++++++++++++++++ tools/marvin/marvin/config/test_data.cfg | 17 +++++++++++++++++ tools/marvin/marvin/config/test_data.py | 17 +++++++++++++++++ tools/marvin/marvin/src/__init__.py | 16 ++++++++++++++++ 5 files changed, 84 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f57f22a7/test/integration/component/test_escalations.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_escalations.py b/test/integration/component/test_escalations.py index f2ae801..e132fb0d 100644 --- a/test/integration/component/test_escalations.py +++ b/test/integration/component/test_escalations.py @@ -1,3 +1,20 @@ +# 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 Local Modules from marvin.cloudstackTestCase import * from marvin.cloudstackException import * @@ -1684,4 +1701,4 @@ class TestVolumes(cloudstackTestCase): len(list_volumes_after), "upload volume failed" ) - return \ No newline at end of file + return http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f57f22a7/tools/marvin/marvin/config/__init__.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/config/__init__.py b/tools/marvin/marvin/config/__init__.py index e69de29..13a8339 100644 --- a/tools/marvin/marvin/config/__init__.py +++ b/tools/marvin/marvin/config/__init__.py @@ -0,0 +1,16 @@ +# 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. http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f57f22a7/tools/marvin/marvin/config/test_data.cfg ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/config/test_data.cfg b/tools/marvin/marvin/config/test_data.cfg index 816df3d..5a3d8aa 100644 --- a/tools/marvin/marvin/config/test_data.cfg +++ b/tools/marvin/marvin/config/test_data.cfg @@ -1,3 +1,20 @@ +# 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. + { "region": { "regionid": "2", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f57f22a7/tools/marvin/marvin/config/test_data.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 1410e6f..711227c 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -1,3 +1,20 @@ +# 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. + test_data = { "region": { "regionid": "2", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f57f22a7/tools/marvin/marvin/src/__init__.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/src/__init__.py b/tools/marvin/marvin/src/__init__.py index e69de29..13a8339 100644 --- a/tools/marvin/marvin/src/__init__.py +++ b/tools/marvin/marvin/src/__init__.py @@ -0,0 +1,16 @@ +# 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.
