Merge 4.5 to master#36
Closed
karuturi wants to merge 468 commits intoapache:masterapache/cloudstack:masterfrom
karuturi:merge-4.5-to-masterCopy head branch name to clipboard
Closed
Merge 4.5 to master#36karuturi wants to merge 468 commits intoapache:masterapache/cloudstack:masterfrom karuturi:merge-4.5-to-masterCopy head branch name to clipboard
karuturi wants to merge 468 commits intoapache:masterapache/cloudstack:masterfrom
karuturi:merge-4.5-to-masterCopy head branch name to clipboard
Commits
This pull request is big! We're only showing the most recent 250 commits
Commits on Oct 13, 2014
- committed
- authored andcommitted

- committed
Fixed Resource Leaks
Show description for 350ac4ccommittedCLOUDSTACK-7469 Complete simulator build support
Show description for e717450authored andcommitted
- committed
Anthony Xu - committed
Anthony Xu Don't do chmod -R when mounting secondary storage for vmware
Show description for 49c01e2committed
Frank ZhangCLOUDSTACK-7700: Volume Snapshot Async Job returns Success for a failed
Show description for 1e20600committed
Commits on Oct 14, 2014
Fixed few coverity issues
Show description for 0a9742fcommittedCLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
Show description for e4a8bbccommittedRules and visitors for Load Balance Rules
Show description for 1a85213authored andcommitted
Extract general behavior to Router and Vpc delegates
Show description for f28426eauthored andcommitted
Fix dependency problem. Extract and unify router deployment stuff
Show description for 24b230dauthored andcommitted
Adding Firewall Rules to comply with the Visitor pattern implementation; refactoring the applyRules so we can reuse it.
Show description for 65d7e07authored andcommitted
- authored andcommitted

fixing checkstyles
Show description for bbce7d9committedfinished firewall rules and load balancing rules; fixed all the injection problems; added VirtualMachineManager to the appliance factory to be injected.
Show description for 4b1112acommitted- authored andcommitted
adding static nat rules. Deploying new VMs is not working due to the appliance refactory, will check the changes with Antonio tomorrow.
Show description for fb8973fcommitted- committed
- committed
adding Ip Association and VPN Rules
Show description for 6b2d35ccommitted- authored andcommitted

package rename
Show description for e1866bfauthored andcommitted- authored andcommitted

fixing the classes relationship; adding beans properly in the spring context; using the right basic/advance stuff; testing ip and port forwarding rules
Show description for 87f0e68committedadding password to router rules; moving the advance code to the advance net topology.
Show description for 299c42ccommittedUnify and encapsulate deployment flow methods and params
Show description for 631b561authored andcommitted
adding userdata to router and ssh pub key to router rules.
Show description for f0189accommittedmaking instance variables compliant with ACS convention
Show description for b9ffe23committedadding user data pwd rules
Show description for 8f313cacommittedfixing injection of beans with a relationship
Show description for d153296committedwhitespace
Show description for c76952bauthored andcommittedfixing the injection of the networkDao
Show description for e99b5b0committedDeployment more OO - Objects with data and behavior
Show description for 95395f9authored andcommitted
- committed
fixing import in virtual router element and checkstyle in dhcp entry related changes
Show description for 0b78731committedcommenting broken code in tests in order to run build adn tests other changes via the UI
Show description for e35fdedcommitted- committed
- committed
- authored andcommitted

apply network acls; acls items to pvt gw; vpc ip association
Show description for b97f2b0committed- committed
- authored andcommitted

- authored andcommitted

More refactoring and testing in the same classes
Show description for 6fac126authored andcommitted
- authored andcommitted

Replacing the old [Vpc}VirtualNetworkApplianceManager by the new ones;
Show description for 12b0d18committedComplete tests for normal deployment and start vpc one
Show description for d2d9157authored andcommitted
- authored andcommitted

- authored andcommitted

- authored andcommitted

moving sendCommand to the NetworkGeneralHelper;
Show description for 16ad412committedfixing check styles
Show description for 00dc8a7committedRefactor to include network creation as actual deployment
Show description for 2da3cedauthored andcommitted
adding applyStaticRoutes method to the network topology/visitor. it will be used by the VPC virtual net manager appliance.
Show description for b96035fcommitted- committed
DeployRouter includes nw creation following TellDontAsk principle
Show description for 3d4ddb7authored andcommitted
Whole router.deployment package got 97% coverage
Show description for b9bff84authored andcommitted
adding setupPrivateGateway to new style;
Show description for 01edc8ecommittedfixing check style issues
Show description for e08cb11committed- authored andcommitted

- authored andcommitted

refactor all private methods in the virtual router appliance and VPC appliance
Show description for 546e563committedauto wire the network helper
Show description for 65fb216committedRefactor hypervisor retrieval from VpcNwHelper and NwHelper
Show description for cd8cadaauthored andcommitted
- authored andcommitted

- committed
fixing nic plug unplug rule
Show description for b7c193acommittedmerging cmd-visitor into cmd-visitor-rebase, with the upstream from ACS repo
Show description for ee9068bcommitted- authored andcommitted

making sure the instance variable _router in the Rules is being used instead of the parameter
Show description for dc5fefccommitted- committed
Removing the VirtualNetworkStatus, it was not being used properly;
Show description for f2f4732committed- committed
Changing the way the DAOs were being injected in the RuleApplier;
Show description for 9f801d1committedfixing checkstyle in the virtual network manager. problem appeared after a rebase. probably due to my saving action in the eclipse workspace
Show description for 025ff72committedFixing the NetworkHelperImpl class. It was throwing a NPE due to a hypervisor type SIMULATOR not being in the hashmap.
Show description for 4e21948committedCLOUDSTACK-6278 Baremetal Advanced Networking support from commit id e06fa18ed2ee2ee6a417e089cf5ac6bde11d0079 by Frank Zhang
Show description for 3ac2e22committedApplying the latest chances from the VPC Refactor branch onto the new one.
Show description for c81b338committedApplygin fix from commit ID aaeadc5c44e3fe16a1deea5348b085b08b5f4f4d
Show description for db86bdfcommittedApplying fix from commit id 6b8e0baa21e6cffc62eb2d35eecc7aeb2087d1c1
Show description for 2ed64b2committedFixing checkstyle.
Show description for 1e87d7bcommitted- committed
- committed
Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to seconda…
Show description for 35a8b70committed
Mike Tutkowski- committed
Jessica Wang
Commits on Oct 15, 2014
- committed
Mike Tutkowski - committed
sailajamada CLOUDSTACK-7693: Fixing pep8 issues
Show description for 35e05a6authored andcommitted

CLOUDSTACK-7690: Added missing unittest import to test_escalations_volumes.py
Show description for bd9d57eauthored andcommitted

CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller
Show description for 3b442accommitted
Commits on Oct 16, 2014
CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.
Show description for 6967c6cauthored andcommitted
- committed
Jayapal - committed
Jayapal - authored andcommitted

Fixed coverity and other resource leak issues
Show description for efe1e0acommitted- committed
- committed
Merge remote-tracking branch 'origin/4.5' into merge-master
Show description for 148efbbcommittedCLOUDSTACK-7727 Skip various BVT tests on LXC
Show description for 20d3cf1authored andcommitted
PR: #23 Merge 4.5 back into master from 'DaanHoogland/merge-master'
Show description for 7072d8dcommitted- committed
Jessica Wang - committed
Jessica Wang - committed
Jessica Wang - committed
Jessica Wang CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by XXXXXXX view > listView > detailView > add View All link > show read-only text "group by zone/pod/cluster/account" in select view a…
Show description for 6239447committed
Jessica Wang- committed
Jessica Wang
Commits on Oct 17, 2014
- committed
- committed
Adding new test which would verify the fix for issue "The ISO/Template is automatically deleted after URL expires"
Show description for a1b913dcommitted
sanjeevCLOUDSTACK-7749: AsyncJob GC thread cannot purge queue items that have been blocking for too long if exception is thrown in expunging some unfinished or completed old jobs, this will make some futu…
Show description for 248e4fbcommitted- committed
Jessica Wang
Commits on Oct 20, 2014
Commits on Oct 21, 2014
CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed. Also bring the logic…
Show description for e1a993dcommitted- committed
There are few cases that mgt server won't reponse agent's pingcommand timely, or in KVM's case, libvirt won't repsonse in few mintues, which will cause agent reconnect to mgt server, then all the o…
Show description for 2e45020committed- committed
Anthony Xu - committed
Anthony Xu - committed
Mike Tutkowski - committed
Mike Tutkowski - committed
Mike Tutkowski - committed
Mike Tutkowski Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"
Show description for 57dacf9committed
Mike TutkowskiInvoke grantAccess and revokeAccess one time each using a SnapshotInfo (where previously a VolumeInfo was being passed in)
Show description for 1b5bb7dcommitted
Mike Tutkowski- committed
Mike Tutkowski - committed
Mike Tutkowski - committed
Mike Tutkowski - committed
Mike Tutkowski - committed
Mike Tutkowski - committed
Frank Zhang
Commits on Oct 22, 2014
CLOUDSTACK-7761:
Show description for 70112bdcommitted
Anthony Xu- committed
Sangeetha Hariharan - committed
Mike Tutkowski - committed
Anthony Xu - committed
- authored andcommitted

CLOUDSTACK-7771: Throw exception while restoring vm if the template is already deleted. Also fix the usage event being generated from the right template id and fix the log message which sometime sh…
Show description for ee0f0a1committed
Commits on Oct 23, 2014
- committed
- committed
- committed
Fixed incorrect label issue.
Show description for 4e12841authored andcommitted
- committed
Jessica Wang - committed
- committed
Anthony Xu - committed
Jessica Wang - committed
Jessica Wang - committed
Jessica Wang - committed
Jessica Wang
Commits on Oct 24, 2014
Commits on Oct 27, 2014
Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
Show description for 9bcf0e1committed- committed
- committed
Anthony Xu CLOUDSTACK-7795
Show description for 2ae4023committed
Frank ZhangCLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to
Show description for 4f43839committedCLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
Show description for 307a35acommitted
Sheng Yang- committed
- committed
Jessica Wang
Commits on Oct 28, 2014
- committed
- committed
Jessica Wang - committed
Jessica Wang - committed
Jessica Wang - authored andcommitted
- authored andcommitted
- authored andcommitted
CLOUDSTACK-7764: No IP Address Validations when Adding Networks Added validations for Add Network form on IPv4 Gateway, IPv4 Netmask, IPv4 Start IP, IPv4 End IP, IPv6 Gateway, IPv6 CIDR, IPv6 Start…
Show description for efb3287authored andcommitted- authored andcommitted
- committed
Jessica Wang - committed
- committed
Jessica Wang CLOUDSTACK-7814: Fix default passphrase for keystores
Show description for 57c4841committed
Sheng Yang- committed
Jessica Wang
Commits on Oct 29, 2014
- committed
CID-1249800 Fix a coverity bug, but disable the code its used in as it
Show description for 320544fcommitted- committed
- committed
- committed
- committed
- committed
- committed
Fix a bug that prevented me from starting CS.
Show description for a265d7bcommitted- authored andcommitted
- authored andcommitted
Project dashboard: Fix user label overflow
Show description for 160fc13committed- committed
Jessica Wang
Commits on Oct 30, 2014
CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots.
Show description for a4d8215committed- committed
- committed
PR #27 CLOUDSTACK-7767
Show description for 448bb79committedPR #26 CLOUDSTACK-7688, CLOUDSTACK-7747
Show description for 62f9bf0committed- committed
- committed
Anthony Xu - committed
- committed
Anthony Xu saml: Use camelCase api names for SAML login/logout apis
Show description for f543d86committedSAMLUtils: SAML user id should fit within the UUID VARCHAR(40) column
Show description for 7716989committednew managed nfs storage adapter
Show description for 09a62b8authored andcommitted
- committed
Jessica Wang
Commits on Oct 31, 2014
- committed
CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC
Show description for 03a4315committed
Sheng Yang- committed
CLOUDSTACK-7824: using debian 7.7.0 and
Show description for 93529e4committed
SrikanteswaraRao TalluriCLOUDSTACK-7660: Enhance system vm template to support baremetal
Show description for 6c04d86authored andcommitted

- committed
Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests"
Show description for f28ade5committedFixed root disk resize on deploy for RBD.
Show description for 3a52a83authored andcommitted- committed
CLOUDSTACK-7826: UI - dialog widget - dependent dropdown field (dependsOn property specified) - fix a bug that default opton in dependent dropdown field didn't trigger change event handler until an…
Show description for 21f3957committed
Jessica Wang- committed
Commits on Nov 3, 2014
CLOUDSTACK-7748: Cloudstack version number is missing in system vm template. /etc/cloudstack-release in system vm does not have version number which leads in vm deployment failure while checking ro…
Show description for 34b7288authored andcommitted
- committed
- committed
- committed
- committed
- committed
- committed
CLOUDSTACK-7832: Move some job db update and item purge to
Show description for ffaabdccommitted- committed
- committed
Anthony Xu systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE20143566)
Show description for 88acc9bcommitted- committed
- committed
Jessica Wang
Commits on Nov 4, 2014
CLOUDSTACK-7834
Show description for 62c5cefcommitted
Frank ZhangCLOUDSTACK-7632:Automation for volume life cycle testPath
Show description for 9e37a51authored andcommitted

CLOUDSTACK-7728: Test script to identify product issue
Show description for b277b1aauthored andcommitted

CLOUDSTACK-7692: Fixed template register issue in test_project_usage.py
Show description for 5d37f37authored andcommitted

CLOUDSTACK-7691: Fixed 'Exception not raised' issue in test_project_limits.py
Show description for bf7ce74authored andcommitted

CLOUDSTACK-7684: Fixed Exception not raised issue in secondary storage limits test suite test_ss_max_limits.py
Show description for 1f7ffb2authored andcommitted

CLOUDSTACK-7682: Fixed usage event issue. Used api client of account for which we are checking the usage
Show description for 8831236authored andcommitted

CLOUDSTACK-7802: test_vpc_network.py - Increasing polling period for network state check
Show description for 7b48b69authored andcommitted

CLOUDSTACK-7801: test_volumes.py - Fixed import and pep8 issues
Show description for 6d7666bauthored andcommitted

CLOUDSTACK-7685: Fixed copy template method call in test_escalations_template.py. Removed unbound method of the same name as bound method from base library and changed method call accordingly
Show description for d5316d0authored andcommitted

CLOUDSTACK-7805: test_vpc_vms_deployment.py - Removing invalid steps from test case
Show description for 0d6e3e4authored andcommitted

Revert "CLOUDSTACK-7408: Fixed - Private key of the ssh keypair was getting corrupted"
Show description for 9e19a9aauthored andcommitted

CLOUDSTACK-7800: VMware - Hot plug/unplug NIC to/from VM only when vmware tools are installed, else assert for exception
Show description for 8b636bdauthored andcommitted

CVE20143566: Avoid using SSLv3 on apache2 webserver used by SSVM
Show description for ce51fe3committedCLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs
Show description for 7a8f511committedCLOUDSTACK-7835: Deleted volumes with null UUID and no removed timestamp in database still appear.
Show description for 1d503bbcommittedCLOUDSTACK-7421
Show description for 0327c2bcommitted- committed
Jessica Wang CLOUDSTACK-7720: No IP Address Validation for Acquire new secondary IP
Show description for 2a17932authored andcommitted- authored andcommitted
CLOUDSTACK-7840: UI control tip for 'Add Primary Storage' -> 'Provider' seems wrong
Show description for 1f21f39authored andcommittedFixes: [UI] Added missing label to properties.file.
Show description for 03fa319authored andcommitted
CLOUDSTACK-7645
Show description for 4e80253authored andcommitted
- committed
Jessica Wang
Commits on Nov 5, 2014
CLOUDSTACK-7841: Gracefully reload haproxy config
Show description for 4b3217fcommitted
Sheng Yang- committed
- committed