incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [16/60] [abbrv] git commit: committing some more changes to marvins license headers
Date Thu, 27 Sep 2012 12:23:46 GMT
committing some more changes to marvins license headers


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6fe595f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6fe595f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6fe595f3

Branch: refs/heads/regions
Commit: 6fe595f3d3de62b550905ee7ed7d27164b031b0a
Parents: 54d7a10
Author: David Nalley <david@gnsa.us>
Authored: Wed Jul 4 18:50:49 2012 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Wed Jul 4 18:50:49 2012 -0400

----------------------------------------------------------------------
 tools/marvin/LICENSE.txt                           |   26 +++++++++-----
 .../marvin/sandbox/demo/live/testSshDeployVM.py    |   26 ++++++++------
 .../sandbox/demo/simulator/simulator_setup.py      |   17 +++++++++
 .../sandbox/demo/simulator/testcase/libs/base.py   |   19 +++++++++--
 .../sandbox/demo/simulator/testcase/libs/common.py |   21 +++++++++--
 .../sandbox/demo/simulator/testcase/libs/utils.py  |   19 +++++++++--
 .../demo/simulator/testcase/test_vm_life_cycle.py  |   27 +++++++++------
 tools/marvin/setup.py                              |   19 +++++++++--
 8 files changed, 130 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fe595f3/tools/marvin/LICENSE.txt
----------------------------------------------------------------------
diff --git a/tools/marvin/LICENSE.txt b/tools/marvin/LICENSE.txt
index fa64b4a..00ae6c0 100644
--- a/tools/marvin/LICENSE.txt
+++ b/tools/marvin/LICENSE.txt
@@ -1,9 +1,17 @@
-Copyright 2012 Citrix Systems, Inc. Licensed under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance with the
-License.  Citrix Systems, Inc. reserves all rights not expressly granted by 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.
+# 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/incubator-cloudstack/blob/6fe595f3/tools/marvin/marvin/sandbox/demo/live/testSshDeployVM.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/live/testSshDeployVM.py b/tools/marvin/marvin/sandbox/demo/live/testSshDeployVM.py
index 63728ef..5438e40 100644
--- a/tools/marvin/marvin/sandbox/demo/live/testSshDeployVM.py
+++ b/tools/marvin/marvin/sandbox/demo/live/testSshDeployVM.py
@@ -1,16 +1,20 @@
 #!/usr/bin/env python
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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/incubator-cloudstack/blob/6fe595f3/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py b/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
index ee80076..0b9c01d 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
+++ b/tools/marvin/marvin/sandbox/demo/simulator/simulator_setup.py
@@ -1,4 +1,21 @@
 #!/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.
+
 
 from ConfigParser import SafeConfigParser
 from optparse import OptionParser

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fe595f3/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/base.py b/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/base.py
index e2fd5d7..0b5da5c 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/base.py
+++ b/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/base.py
@@ -1,7 +1,20 @@
 # -*- encoding: utf-8 -*-
-#
-# Copyright (c) 2012 Citrix.  All rights reserved.
-#
+# 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.
 
 """ Base class for all Cloudstack resources
     -Virtual machine, Volume, Snapshot etc

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fe595f3/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/common.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/common.py b/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/common.py
index 5b2b096..fc18401 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/common.py
+++ b/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/common.py
@@ -1,7 +1,20 @@
 # -*- encoding: utf-8 -*-
-#
-# Copyright (c) 2012 Citrix.  All rights reserved.
-#
+# 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.
 
 """Common functions
 """
@@ -444,4 +457,4 @@ def list_resource_limits(apiclient, **kwargs):
 
     cmd = listResourceLimits.listResourceLimitsCmd()
     [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listResourceLimits(cmd))
\ No newline at end of file
+    return(apiclient.listResourceLimits(cmd))

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fe595f3/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/utils.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/utils.py b/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/utils.py
index 69d524d..8abed18 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/utils.py
+++ b/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/utils.py
@@ -1,7 +1,20 @@
 # -*- encoding: utf-8 -*-
-#
-# Copyright (c) 2012 Citrix.  All rights reserved.
-#
+# 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.
 
 """Utilities functions
 """

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fe595f3/tools/marvin/marvin/sandbox/demo/simulator/testcase/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/testcase/test_vm_life_cycle.py b/tools/marvin/marvin/sandbox/demo/simulator/testcase/test_vm_life_cycle.py
index 176f4ae..9bc7e14 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/testcase/test_vm_life_cycle.py
+++ b/tools/marvin/marvin/sandbox/demo/simulator/testcase/test_vm_life_cycle.py
@@ -1,16 +1,21 @@
 # -*- encoding: utf-8 -*-
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
+
 """ BVT tests for Virtual Machine Life Cycle
 """
 #Import Local Modules

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fe595f3/tools/marvin/setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index af40771..b2d6a40 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -1,7 +1,20 @@
 #!/usr/bin/env python
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License. Citrix Systems, Inc.
+# 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.
 
 from distutils.core import setup
 from sys import version


Mime
View raw message