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 2013/11/06 17:51:20 UTC
[1/2] git commit: updated refs/heads/master to 0ec6b9a
Updated Branches:
refs/heads/master 56070c644 -> 0ec6b9ac9
Missed a null check
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68ce3f56
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68ce3f56
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68ce3f56
Branch: refs/heads/master
Commit: 68ce3f56ac9048071892ce47a1da984768fbde55
Parents: 56070c6
Author: Darren Shepherd <da...@gmail.com>
Authored: Wed Nov 6 09:43:57 2013 -0700
Committer: Darren Shepherd <da...@gmail.com>
Committed: Wed Nov 6 09:44:08 2013 -0700
----------------------------------------------------------------------
utils/src/com/cloud/utils/db/DbProperties.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68ce3f56/utils/src/com/cloud/utils/db/DbProperties.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/db/DbProperties.java b/utils/src/com/cloud/utils/db/DbProperties.java
index a5ad383..55df23d 100644
--- a/utils/src/com/cloud/utils/db/DbProperties.java
+++ b/utils/src/com/cloud/utils/db/DbProperties.java
@@ -65,12 +65,15 @@ public class DbProperties {
if ( is == null ) {
is = PropertiesUtil.openStreamFromURL("db.properties");
}
+
if ( is == null ) {
System.err.println("Failed to find db.properties");
log.error("Failed to find db.properties");
}
- dbProps.load(is);
+ if ( is != null ) {
+ dbProps.load(is);
+ }
EncryptionSecretKeyChecker checker = new EncryptionSecretKeyChecker();
checker.check(dbProps);
[2/2] git commit: updated refs/heads/master to 0ec6b9a
Posted by da...@apache.org.
Ignore all logs for rat, not just the ones at root
Git ignores log files, so basically they shouldn't checked in. This
configures rat to ignore log files also. Specifically the juniper-contrail
code creates a log file during testing.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0ec6b9ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0ec6b9ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0ec6b9ac
Branch: refs/heads/master
Commit: 0ec6b9ac9947e82ced948445bf6c14c0966e731b
Parents: 68ce3f5
Author: Darren Shepherd <da...@gmail.com>
Authored: Wed Nov 6 09:50:45 2013 -0700
Committer: Darren Shepherd <da...@gmail.com>
Committed: Wed Nov 6 09:50:45 2013 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ec6b9ac/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ea62c2..2cee084 100644
--- a/pom.xml
+++ b/pom.xml
@@ -535,7 +535,7 @@
<exclude>CHANGES</exclude>
<exclude>INSTALL.md</exclude>
<exclude>.idea/</exclude>
- <exclude>*.log</exclude>
+ <exclude>**/*.log</exclude>
<exclude>**/*.patch</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>