You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/07/06 08:30:25 UTC

[48/48] git commit: updated refs/heads/master to f1a6490

Merge branch 'PR-REVIEW-335'

This closes #335


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

Branch: refs/heads/master
Commit: f1a64902cc8bd18ace566b8f42ca24032d41dd9b
Parents: 896f6b1 510fc11
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Mon Jul 6 11:48:38 2015 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Mon Jul 6 11:48:38 2015 +0530

----------------------------------------------------------------------
 .../manager/allocator/impl/RandomAllocator.java |  13 +-
 .../allocator/impl/FirstFitAllocator.java       |  28 +-
 .../component/find_hosts_for_migration.py       | 273 +++++++++++++++++++
 3 files changed, 302 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1a64902/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
----------------------------------------------------------------------
diff --cc plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
index 5bdf4f1,390a8af..390a8af
mode 100644,100755..100644
--- a/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
+++ b/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1a64902/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index 44552af,990b77b..3a2b280
mode 100644,100755..100644
--- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java