You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2015/05/20 17:31:34 UTC
[1/3] git commit: updated refs/heads/4.5 to 96297ee
Repository: cloudstack
Updated Branches:
refs/heads/4.5 9c995f1ca -> 96297eeb1
adding mysql dependency for usage
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4eb0586d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4eb0586d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4eb0586d
Branch: refs/heads/4.5
Commit: 4eb0586d82f695a63d275fc724af04a36c23ceaa
Parents: 9c995f1
Author: Abhinandan Prateek <ab...@shapeblue.com>
Authored: Wed May 13 10:11:22 2015 +0530
Committer: Abhinandan Prateek <ag...@gmail.com>
Committed: Wed May 20 20:59:37 2015 +0530
----------------------------------------------------------------------
usage/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4eb0586d/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index eac5a2c..8dbc7db 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -39,6 +39,12 @@
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${cs.mysql.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
[2/3] git commit: updated refs/heads/4.5 to 96297ee
Posted by ap...@apache.org.
adding simple logging for java version dependency
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4215e918
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4215e918
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4215e918
Branch: refs/heads/4.5
Commit: 4215e91824dda986a41a286daad3a3b5c732dfb0
Parents: 4eb0586
Author: Abhinandan Prateek <ab...@shapeblue.com>
Authored: Wed May 13 10:57:37 2015 +0530
Committer: Abhinandan Prateek <ag...@gmail.com>
Committed: Wed May 20 21:00:31 2015 +0530
----------------------------------------------------------------------
usage/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4215e918/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index 8dbc7db..b9bb04b 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -45,6 +45,16 @@
<version>${cs.mysql.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.7</version>
+ </dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
[3/3] git commit: updated refs/heads/4.5 to 96297ee
Posted by ap...@apache.org.
CLOUDSTACK-8467: set version to unknown instead of null
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96297eeb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96297eeb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96297eeb
Branch: refs/heads/4.5
Commit: 96297eeb1064800db9a53148e080d7f558bddda8
Parents: 4215e91
Author: Abhinandan Prateek <ab...@shapeblue.com>
Authored: Wed May 13 12:28:50 2015 +0530
Committer: Abhinandan Prateek <ag...@gmail.com>
Committed: Wed May 20 21:00:50 2015 +0530
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageManagerImpl.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96297eeb/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 8f13aa2..2bf00d1 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -182,10 +182,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
final Class<?> c = UsageServer.class;
_version = c.getPackage().getImplementationVersion();
- if (_version == null) {
- // TODO
- // throw new CloudRuntimeException("Unable to find the implementation version of this usage server");
- }
+ if (_version == null) _version="unknown";
if (s_logger.isInfoEnabled()) {
s_logger.info("Implementation Version is " + _version);