You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/01/31 18:07:19 UTC
[33/43] git commit: refs/heads/regions - rat: Fix apache license
rat: Fix apache license
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ae3d8aa0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ae3d8aa0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ae3d8aa0
Branch: refs/heads/regions
Commit: ae3d8aa018ad86b940d7c917b7e3ba01817a2ba7
Parents: d7ad2da
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Jan 30 17:44:41 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Jan 30 17:44:41 2013 -0800
----------------------------------------------------------------------
docs/en-US/snapshot-throttling.xml | 21 ++++++++++++++++++++-
test/integration/smoke/test_nic.py | 16 ++++++++++++++++
2 files changed, 36 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ae3d8aa0/docs/en-US/snapshot-throttling.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/snapshot-throttling.xml b/docs/en-US/snapshot-throttling.xml
index f1af08a..6bda437 100644
--- a/docs/en-US/snapshot-throttling.xml
+++ b/docs/en-US/snapshot-throttling.xml
@@ -3,6 +3,25 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+<!-- 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.
+-->
+
<section id="snapshot-throttling">
<title>Snapshot Job Throttling</title>
<para>When a snapshot of a virtual machine is requested, the snapshot job runs on the same
@@ -23,4 +42,4 @@
<para>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. </para>
-</section>
\ No newline at end of file
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ae3d8aa0/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index 6cf73ac..b9dfdde 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 *