From ae3d8aa018ad86b940d7c917b7e3ba01817a2ba7 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 30 Jan 2013 17:44:41 -0800 Subject: [PATCH] rat: Fix apache license Signed-off-by: Rohit Yadav --- docs/en-US/snapshot-throttling.xml | 21 ++++++++++++++++++++- test/integration/smoke/test_nic.py | 16 ++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/docs/en-US/snapshot-throttling.xml b/docs/en-US/snapshot-throttling.xml index f1af08a474a..6bda437e503 100644 --- a/docs/en-US/snapshot-throttling.xml +++ b/docs/en-US/snapshot-throttling.xml @@ -3,6 +3,25 @@ %BOOK_ENTITIES; ]> + + +
Snapshot Job Throttling When a snapshot of a virtual machine is requested, the snapshot job runs on the same @@ -23,4 +42,4 @@ The admin can also set job.expire.minutes to place a maximum on how long a snapshot request will wait in the queue. If this limit is reached, the snapshot request fails and returns an error message. -
\ No newline at end of file + diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py index 6cf73acd593..b9dfdde8fe5 100644 --- a/test/integration/smoke/test_nic.py +++ b/test/integration/smoke/test_nic.py @@ -1,3 +1,19 @@ +# 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. """ NIC tests for VM """ import marvin from marvin.cloudstackTestCase import *