Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.1
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/539c1f02 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/539c1f02 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/539c1f02 Branch: refs/heads/4.1 Commit: 539c1f02c2079cbba7570435bfaf23c5f4925127 Parents: e1a9062 af442f7 Author: Pranav Saxena <[email protected]> Authored: Tue Mar 26 20:01:06 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Tue Mar 26 20:01:06 2013 +0530 ---------------------------------------------------------------------- .../util/EncryptionSecretKeyCheckerUtil.java | 2 +- packaging/centos63/cloud.spec | 8 +++----- .../utils/crypt/EncryptionSecretKeyChanger.java | 2 +- .../utils/crypt/EncryptionSecretKeyChecker.java | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
