You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pd...@apache.org on 2015/03/19 15:16:32 UTC

git commit: updated refs/heads/master to dc8ab60

Repository: cloudstack
Updated Branches:
  refs/heads/master 8d4f5b914 -> dc8ab6057


fix centos7 rpm build, file misplaced


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc8ab605
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc8ab605
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc8ab605

Branch: refs/heads/master
Commit: dc8ab6057fb5cbbcfcb9e7296b39488848e17f96
Parents: 8d4f5b9
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Thu Mar 19 10:16:20 2015 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Thu Mar 19 10:16:20 2015 -0400

----------------------------------------------------------------------
 packaging/centos7/java.security.ciphers         | 18 ------------------
 packaging/centos7/tomcat7/java.security.ciphers | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc8ab605/packaging/centos7/java.security.ciphers
----------------------------------------------------------------------
diff --git a/packaging/centos7/java.security.ciphers b/packaging/centos7/java.security.ciphers
deleted file mode 100644
index 986abf6..0000000
--- a/packaging/centos7/java.security.ciphers
+++ /dev/null
@@ -1,18 +0,0 @@
- # 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.
-
-jdk.tls.disabledAlgorithms=DH keySize < 128, RSA keySize < 128, DES keySize < 128, SHA1 keySize < 128, MD5 keySize < 128, RC4
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc8ab605/packaging/centos7/tomcat7/java.security.ciphers
----------------------------------------------------------------------
diff --git a/packaging/centos7/tomcat7/java.security.ciphers b/packaging/centos7/tomcat7/java.security.ciphers
new file mode 100644
index 0000000..986abf6
--- /dev/null
+++ b/packaging/centos7/tomcat7/java.security.ciphers
@@ -0,0 +1,18 @@
+ # 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.
+
+jdk.tls.disabledAlgorithms=DH keySize < 128, RSA keySize < 128, DES keySize < 128, SHA1 keySize < 128, MD5 keySize < 128, RC4
\ No newline at end of file