You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/01/20 03:19:34 UTC
[1/2] git commit: updated refs/heads/master to 240e8ef
Repository: cloudstack
Updated Branches:
refs/heads/master 6a20dd4ea -> 240e8ef8a
CID 1264632: Rely on a known and widely available encoding UTF8
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit 0763b5576dde92b1c4ecfbce3b3b593ed0ca90bc)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60f18cc7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60f18cc7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60f18cc7
Branch: refs/heads/master
Commit: 60f18cc7133743c2a411280090ea1e4b79791993
Parents: 6a20dd4
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Jan 20 07:47:34 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Jan 20 07:49:09 2015 +0530
----------------------------------------------------------------------
utils/src/com/cloud/utils/ConstantTimeComparator.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60f18cc7/utils/src/com/cloud/utils/ConstantTimeComparator.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/ConstantTimeComparator.java b/utils/src/com/cloud/utils/ConstantTimeComparator.java
index 4d4a595..baf2bc2 100644
--- a/utils/src/com/cloud/utils/ConstantTimeComparator.java
+++ b/utils/src/com/cloud/utils/ConstantTimeComparator.java
@@ -19,6 +19,8 @@
package com.cloud.utils;
+import java.nio.charset.Charset;
+
public class ConstantTimeComparator {
public static boolean compareBytes(byte[] b1, byte[] b2) {
@@ -34,6 +36,7 @@ public class ConstantTimeComparator {
}
public static boolean compareStrings(String s1, String s2) {
- return compareBytes(s1.getBytes(), s2.getBytes());
+ final Charset encoding = Charset.forName("UTF-8");
+ return compareBytes(s1.getBytes(encoding), s2.getBytes(encoding));
}
}
[2/2] git commit: updated refs/heads/master to 240e8ef
Posted by bh...@apache.org.
packaging: fix rpm package warning, fix day/date
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit f702097b3ebf72d5b2b0725e07330f75a3657f81)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/240e8ef8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/240e8ef8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/240e8ef8
Branch: refs/heads/master
Commit: 240e8ef8ac6366ffd8268257db94976b9a81f7dd
Parents: 60f18cc
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Jan 20 07:48:26 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Jan 20 07:49:19 2015 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/240e8ef8/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 4702be3..dff5dcb 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -700,5 +700,5 @@ fi
* Fri Jul 04 2014 Hugo Trippaers <hu...@apache.org> 4.5.0
- Add a package for the mysql ha module
-* Fri Oct 03 2012 Hugo Trippaers <hu...@apache.org> 4.1.0
+* Wed Oct 03 2012 Hugo Trippaers <hu...@apache.org> 4.1.0
- new style spec file