18008 Commits

Author SHA1 Message Date
Edison Su
a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Kishan Kavala
3388b77156 CLOUDSTACK-2487: Show error while adding acl_item to default ACL 2013-05-15 12:51:08 +05:30
Edison Su
ed065418b6 add license header 2013-05-14 21:58:07 -07:00
Edison Su
879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Min Chen
c6a5a7ee00 Fix CLOUDSTACK-2495: public templates are not visible to non-root users. 2013-05-14 21:52:29 -07:00
radhikap
be9850161e CLOUDSTACK-2467 and CLOUDSTACK-2466 2013-05-15 09:18:57 +05:30
Koushik Das
f484f4af09 CLOUDSTACK-2475: Failed to create PF rules with Cisco VNMC as the port pool object name is exceeding the max limit
Ip and port pool object names in VNMC were created by appending guest vlan, public ip and id of corresponding rule for better readability. This resulted in the name exceeding max. length allowed.
Shortened the name by removing public ip part from it.
2013-05-15 09:12:48 +05:30
Anthony Xu
1518e7ee43 CLOUDSTACK-2115: remove the trailing '\n' to get correct XS network mode 2013-05-14 17:52:10 -07:00
Edison Su
68ffe1c706 fix bug in create volume from snapshot 2013-05-14 16:38:02 -07:00
Min Chen
564d3d6fa0 Fix CLOUDSTACK-2488: Delete iso async job is running forever. 2013-05-14 16:12:49 -07:00
Alena Prokharchyk
26cefdcfac When UUID field is null for existing records, set it to id
Conflicts:
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2013-05-14 15:11:41 -07:00
Min Chen
252f384e89 Fix CLOUDSTACK-2485: ClassCastException in extracting ISO. 2013-05-14 14:57:02 -07:00
Min Chen
95e7e270d4 Fix the hanging issue in deleting ISO referenced by some user vms. 2013-05-14 14:57:02 -07:00
Min Chen
03c255068b Fix CLOUDSTACK-2484: not able to deploy VM from registered ISO. 2013-05-14 14:57:02 -07:00
Min Chen
87af4ddab0 Only download eligible system template for S3 image store. 2013-05-14 14:57:01 -07:00
Edison Su
12583bbffc snapshot path is accountId + volumeid 2013-05-14 13:20:10 -07:00
Pranav Saxena
edb2f3da26 CLOUDSTACK-768:ACLs on Private GATEWAY :Acl id on Private Gateway ListView 2013-05-15 00:22:26 +05:30
Min Chen
2102ede2e7 Fix CLOUDSTACK-2469: default template is not downloaded. 2013-05-14 11:42:24 -07:00
Alena Prokharchyk
eff7587d51 InternalLB: allow domain admin to stop/start internal lb vms 2013-05-14 10:38:17 -07:00
Pranav Saxena
10380cea41 CLOUDSTACK-768:ACLs on Private GATEWAY 2013-05-14 22:47:53 +05:30
Wido den Hollander
b5bb9f251c debian: Change the version in the changelog 2013-05-14 15:56:36 +02:00
Srikanteswararao Talluri
237397df3c CLOUDSTACK-2382: fix the validation part in the test_global_settings 2013-05-14 17:31:21 +05:30
Jayapal
46f8b6f34a CLOUDSTACK-2400 updated the error message and replacenetworkacl on private gateway 2013-05-14 16:11:33 +05:30
Jayapal
c94c71b4ce CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways 2013-05-14 16:10:38 +05:30
sanjeevneelarapu
7d380423b5 CLOUDSTACK-702: Tests for Multiple IP Ranges
1. Add ip range super set to existing CIDR
2. Add ip range subset to existing CIDR

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 15:52:54 +05:30
Hugo Trippaers
37ca43684b CLOUDSTACK-2440 Print a warning if the rpm can't determine the previous configuration for server.xml or tomcat.conf 2013-05-14 11:05:04 +02:00
Prasanna Santhanam
80c2ea769e Fixing merge markers introduced by conflict from 2660a6
test had conflict markers as a result of an improper merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 14:35:45 +05:30
Jayapal
55739f93b8 CLOUDSTACK-2403 Fixed configuring private gateway with sourcenatsupported=false 2013-05-14 12:22:08 +05:30
Prasanna Santhanam
a92abaa916 multiple fixes to regression tests in test/component
- invalid variable references
- syntax/indentation errors
- self/cls reference errors
- some logic fixes in redundant router suite

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 11:42:34 +05:30
Min Chen
bbdab9806d CLOUDSTACK-2470: listVolume throws db exception. 2013-05-13 22:09:06 -07:00
Prasanna Santhanam
8f57a851be account name dereferences as account.name
Fix to tests to conform to library changes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 10:34:01 +05:30
Prasanna Santhanam
894413e362 Marvin IP cleared tests for various cloudstack components
One big blob of all the tests that were posted for IP clearance several
months ago. IP clearance VOTE has passed on general@

Ref: http://markmail.org/thread/xareczan2kx4hhom

RAT check passed.
2013-05-14 10:24:27 +05:30
Gavin Lee
1a31a3bb10 typo when yum install, ws-common-utils should be ws-commons-util 2013-05-14 10:21:14 +08:00
radhikap
9f9333b363 fix build error 2013-05-14 07:37:07 +05:30
radhikap
e3ff2b33ae fix build error 2013-05-14 07:26:51 +05:30
Jessica Tomechak
a8cebac30d Docs. Change step by step procedure from bullets to numbers in Adding a Host section. 2013-05-13 18:53:13 -07:00
Min Chen
3424ac86ad Fix size issue for template created from snapshot. 2013-05-13 17:45:22 -07:00
Edison Su
0ce01e56db set template size when creating template from snapshot 2013-05-13 16:45:03 -07:00
Edison Su
a7480530f7 fix RAT 2013-05-13 16:22:46 -07:00
Jessica Wang
b082e23af3 CLOUDSTACK-2351: object store - UI - restore UI change that was overwriten by the sync from master branch. 2013-05-13 16:22:20 -07:00
Min Chen
9777e56e8e Update built-in template size in vm_template table. 2013-05-13 15:46:01 -07:00
Min Chen
dafe2654b6 Fix default devcloud.cfg 2013-05-13 15:46:00 -07:00
Min Chen
5341f299ff We still need the hack of Ready to Ready transition for NFS. 2013-05-13 15:46:00 -07:00
Alena Prokharchyk
dfdc089668 CLOUDSTACK-2465: fixed network creation in VPC - removed extra call to createGuestNetwork introduced by the NetworkACL feature merge 2013-05-13 15:28:08 -07:00
Jessica Wang
eeb012308c CLOUDSTACK-2351: object store - UI - zone wizard - add secondary storage step - when provider is S3, add Create NFS Cache Storage option. 2013-05-13 15:10:34 -07:00
Edison Su
1694c1a502 fix download timeout 2013-05-13 14:40:49 -07:00
Sheng Yang
2bcf71638d PVLAN: Add integration test 2013-05-13 11:42:15 -07:00
Sheng Yang
065d2561b9 CLOUDSTACK-2392: Not allow create pvlan network with ipv6 2013-05-13 11:40:40 -07:00
Min Chen
e6faa47a4b Remove unnecessary state machine entry after refactoring
sendMessageAsyncWithListener to use sendMessageAsync.
2013-05-13 11:36:44 -07:00
Nitin Mehta
70e78db3c7 Fix gslb documentation 2013-05-14 00:03:49 +05:30