Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cefd099c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cefd099c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cefd099c Branch: refs/heads/master Commit: cefd099c9db0c3ede232664cc3d5db525164f6d6 Parents: 35f2dc6 68b8da0 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Mon Jun 3 15:44:00 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Mon Jun 3 15:44:00 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/server/StatsCollector.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------