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:26:17 UTC
[1/2] git commit: updated refs/heads/4.4-forward to 5eb0265
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward af4e86854 -> 5eb026534
blacklist pcspkr as cosmetic improvement. aesni_intel blacklisting was not working because the include only works if the file ends with .conf.
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit 11f532bbecca08b41dd15d1abdf04957c84eebda)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f94ff4ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f94ff4ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f94ff4ad
Branch: refs/heads/4.4-forward
Commit: f94ff4ad041c517b048ce8fc58ef3996b98aa685
Parents: af4e868
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Wed May 21 15:53:00 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 10 16:25:19 2014 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/modprobe.d/aesni_intel | 1 -
systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf | 1 +
systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f94ff4ad/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
deleted file mode 100644
index 1c140f0..0000000
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
+++ /dev/null
@@ -1 +0,0 @@
-blacklist aesni_intel
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f94ff4ad/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
new file mode 100644
index 0000000..1c140f0
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -0,0 +1 @@
+blacklist aesni_intel
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f94ff4ad/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
new file mode 100644
index 0000000..da3dbd9
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -0,0 +1 @@
+blacklist pcspkr
\ No newline at end of file
[2/2] git commit: updated refs/heads/4.4-forward to 5eb0265
Posted by da...@apache.org.
rats
(cherry picked from commit b85dd956f8187ea2810f4fd74728c0a430ce6ef4)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5eb02653
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5eb02653
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5eb02653
Branch: refs/heads/4.4-forward
Commit: 5eb026534929774d468976870979440b88f7a5b8
Parents: f94ff4a
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:25:55 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/5eb02653/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/5eb02653/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