You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/10 16:29:17 UTC
[3/5] git commit: updated refs/heads/4.4 to 99aa7a0
rats
(cherry picked from commit b85dd956f8187ea2810f4fd74728c0a430ce6ef4)
(cherry picked from commit 5eb026534929774d468976870979440b88f7a5b8)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4262080b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4262080b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4262080b
Branch: refs/heads/4.4
Commit: 4262080ba49fc8f0dc8c4f29f94159e3e8cbad50
Parents: 3394d3c
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jun 10 16:21:06 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 10 16:28:41 2014 +0200
----------------------------------------------------------------------
.../debian/config/etc/modprobe.d/aesni_intel.conf | 16 ++++++++++++++++
.../debian/config/etc/modprobe.d/pcspkr.conf | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4262080b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
index 1c140f0..2bc7cb1 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -1 +1,17 @@
+# 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.
blacklist aesni_intel
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4262080b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
index da3dbd9..892b51f 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -1 +1,17 @@
+# 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.
blacklist pcspkr
\ No newline at end of file