You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/18 16:00:57 UTC

[6/6] git commit: updated refs/heads/master to fac259f

Merge release branch 4.7 to master

* 4.7:
  Fix execution counter to support separate counts per thread
  Add test to check that each thread has it's own execution counter
  CLOUDSTACK-9231: Root volume migration from one primary to another primary storage within the same cluster is failing


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

Branch: refs/heads/master
Commit: fac259f0fb0c80fed9557c9dcb37a283aab721d4
Parents: 00f106d f0fca60
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Jan 18 16:00:29 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Jan 18 16:00:29 2016 +0100

----------------------------------------------------------------------
 .../agent/api/MigrateWithStorageCommand.java    |  7 +++
 .../api/MigrateWithStorageReceiveAnswer.java    | 12 ++---
 .../api/MigrateWithStorageReceiveCommand.java   |  9 ++--
 .../api/MigrateWithStorageSendCommand.java      | 12 ++---
 ...MigrateWithStorageReceiveCommandWrapper.java | 17 ++++---
 ...610MigrateWithStorageSendCommandWrapper.java | 30 ++++++++-----
 .../motion/XenServerStorageMotionStrategy.java  | 11 ++---
 .../xenbase/XenServer610WrapperTest.java        | 40 ++++++++---------
 .../cloud/network/nicira/ExecutionCounter.java  | 12 +++--
 .../network/nicira/ExecutionCounterTest.java    | 47 ++++++++++++++++++++
 10 files changed, 137 insertions(+), 60 deletions(-)
----------------------------------------------------------------------