cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [5/5] git commit: updated refs/heads/master to bdaa60f
Date Sat, 12 Dec 2015 13:04:16 GMT
Merge release branch 4.6 to master

* 4.6:
  Show actual diff in commits after merge
  CLOUDSTACK-9113: skip vm with inconsistent state when getVmStats/getVmDiskStats


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bdaa60fd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bdaa60fd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bdaa60fd

Branch: refs/heads/master
Commit: bdaa60fd6c04f0e8d08bf889a11702eb6017ad53
Parents: 7fa62a5 65bf2ed
Author: Remi Bergsma <github@remi.nl>
Authored: Sat Dec 12 14:03:43 2015 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Sat Dec 12 14:03:43 2015 +0100

----------------------------------------------------------------------
 .../LibvirtGetVmDiskStatsCommandWrapper.java        | 16 ++++++++++------
 .../wrapper/LibvirtGetVmStatsCommandWrapper.java    | 14 +++++++++-----
 tools/git/git-fwd-merge                             |  5 +++++
 tools/git/git-pr                                    |  3 +++
 4 files changed, 27 insertions(+), 11 deletions(-)
----------------------------------------------------------------------



Mime
View raw message