[4/5] git commit: updated refs/heads/4.3 to ec823db

2014-07-03 Thread weizhou
[UI] bug fix: vpn configuration does not show ipsec presharedkey Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec55f5ca Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec55f5ca Diff: http://git-wip-us.

[1/5] git commit: updated refs/heads/4.3 to ec823db

2014-07-03 Thread weizhou
Repository: cloudstack Updated Branches: refs/heads/4.3 f6aff77b8 -> ec823db47 [UI] deploy vm to specified host in Infrastructure->Hosts page Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3cbb797 Tree: http://

[5/5] git commit: updated refs/heads/4.3 to ec823db

2014-07-03 Thread weizhou
[UI] bug fix: error message was not shown if fail to delete snapshot Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec823db4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec823db4 Diff: http://git-wip

[2/5] git commit: updated refs/heads/4.3 to ec823db

2014-07-03 Thread weizhou
[UI] show all secondary ips in VM NIC page Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b7ac9df Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b7ac9df Diff: http://git-wip-us.apache.org/repos/asf/c

[3/5] git commit: updated refs/heads/4.3 to ec823db

2014-07-03 Thread weizhou
[UI] update vm nic information after add/remove NIC Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe1cdbd2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe1cdbd2 Diff: http://git-wip-us.apache.org/re

git commit: updated refs/heads/4.4-forward to f5139f7

2014-07-03 Thread girish
Repository: cloudstack Updated Branches: refs/heads/4.4-forward 40e28de72 -> f5139f783 CLOUDSTACK-7062: Tagging test case with BugId Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f5139f78 Tree: http://git-wip-u

git commit: updated refs/heads/master to ce5061e

2014-07-03 Thread koushik
Repository: cloudstack Updated Branches: refs/heads/master b2d613f53 -> ce5061e10 CLOUDSTACK-6834 : 3. Some description changes words like CloudStack etc 4. Change Default installation location if possible include version number 5. Mysql Connector Installer along with other dependecies 6. Add

git commit: updated refs/heads/master to 8c61566

2014-07-03 Thread girish
Repository: cloudstack Updated Branches: refs/heads/master ce5061e10 -> 8c61566d6 CLOUDSTACK-7062: Tagging test case with bug Id Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c61566d Tree: http://git-wip-us.ap

git commit: updated refs/heads/4.3 to 3bf4c29

2014-07-03 Thread sebgoa
Repository: cloudstack Updated Branches: refs/heads/4.3 ec823db47 -> 3bf4c2943 CLOUDSTACK-6926: removed hard coded jdk dirs and setting java home using readlink and dirname Signed-off-by: Sebastien Goasguen Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-

[1/2] git commit: updated refs/heads/4.4 to 29b09b1

2014-07-03 Thread dahn
Repository: cloudstack Updated Branches: refs/heads/4.4 332836746 -> 29b09b1e2 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account Changes: -DeploymentPlanner should include disabled resources only when the VM owner is Admin account. T

[2/2] git commit: updated refs/heads/4.4 to 29b09b1

2014-07-03 Thread dahn
CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account Changes: - removing unused imports Conflicts: server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java (cherry picked from commit f37b1524892ab805615dbff2c59e5a1d10c116d3)

git commit: updated refs/heads/master to 4607c26

2014-07-03 Thread koushik
Repository: cloudstack Updated Branches: refs/heads/master 8c61566d6 -> 4607c2694 Revert "CLOUDSTACK-6834 : 3. Some description changes words like CloudStack etc 4. Change Default installation location if possible include version number 5. Mysql Connector Installer along with other dependecie