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

Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/12/13 19:05:14 UTC

[3/3] git commit: updated refs/heads/master to 50c20da

Merge release branch 4.6 to master

* 4.6:
  CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count


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

Branch: refs/heads/master
Commit: 50c20dab17d784b7723faf23e72583261004c1e1
Parents: 08a1b11 5774b96
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 13 19:04:22 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 13 19:04:22 2015 +0100

----------------------------------------------------------------------
 .../orchestration/NetworkOrchestrator.java      |  2 +-
 engine/schema/src/com/cloud/vm/dao/NicDao.java  |  2 +-
 .../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 31 +++++++++++++-------
 3 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50c20dab/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50c20dab/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
----------------------------------------------------------------------