You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/10/12 02:34:11 UTC
[1/2] git commit: fixing license header for test_allocation_states.py
CLOUDSTACK-314
Updated Branches:
refs/heads/4.0 8a6dbbfaf -> c131107b1
fixing license header for test_allocation_states.py CLOUDSTACK-314
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c131107b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c131107b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c131107b
Branch: refs/heads/4.0
Commit: c131107b1b7ce2800762ed9ec5a602f41dc567b1
Parents: 7a5227a
Author: David Nalley <da...@gnsa.us>
Authored: Thu Oct 11 08:05:41 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Thu Oct 11 20:33:32 2012 -0400
----------------------------------------------------------------------
.../component/test_allocation_states.py | 30 ++++++++------
1 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c131107b/test/integration/component/test_allocation_states.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_allocation_states.py b/test/integration/component/test_allocation_states.py
index 5d702b9..8bf2dc4 100644
--- a/test/integration/component/test_allocation_states.py
+++ b/test/integration/component/test_allocation_states.py
@@ -1,16 +1,20 @@
-# -*- 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.
-#
-# Automatically generated by addcopyright.py at 04/03/2012
+# 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 marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *