apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,952 Commits 307 Branches 324 Tags
Commit Graph

15952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Min Chen
14ef9151a5 Fix ClassCastException. 2013-02-07 16:23:56 -08:00
Min Chen
640fa6be76 Fix a bug in converting Enum type to String. 2013-02-07 12:23:57 -08:00
Min Chen
105bf7134a Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-02-06 15:27:45 -08:00
Jessica Wang
01d7fa4bed CLOUDSTACK-1166: cloudstack UI - dashboard - sanitize content before setting it to a HTML element. 2013-02-06 10:42:35 -08:00
Marcus Sorensen
7330deeb2f Summary: Add default newline after summary in prepare-commit-msg 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360171397 -0700
 2013-02-06 10:23:17 -07:00
Marcus Sorensen
ec6fdc7471 Summary: Fix NPE when calling createFirewallRule 
Detail: CreateFirewallRuleCmd.java was returning 'null' for getTrafficType().
Recently, getTrafficType started being used by createIngressFirewallRule.
Changing getTrafficType() to return ingress per Jayapal Reddy.

BUG-ID: CLOUDSTACK-1168
Bugfix-for: master,4.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360170916 -0700
 2013-02-06 10:15:16 -07:00
Marcus Sorensen
dc7578c72c Summary: Make prepare-commit-msg hook more compatible with operating systems 
Detail: Was using sed -i, which breaks on Mac

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360170672 -0700
 2013-02-06 10:11:12 -07:00
Hugo Trippaers
b28f3addfc If encryption is already initialized we don't need to do it again. 2013-02-06 16:49:12 +01:00
Hugo Trippaers
b1d70f7fe3 Before any database calls are made we need to make sure that encryption 
is properly initialized if we have an encrypted db.properties.
 2013-02-06 15:55:13 +01:00
Marcus Sorensen
c5185c09ef Summary: Add missing ResizeVolumeCommand in VmwareResource.java 
Submitted-by: hongtu_zang <hongtu_zang@tcloudcomputing.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-02-06 07:52:37 -07:00
Pranav Saxena
6e4aeeadf4 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-02-06 20:18:15 +05:30
Radhika PC
944f7b0465 CLOUDSTACK-722 - Documentation:Changing the SSL proxy console certificate 2013-02-06 20:16:01 +05:30
Rohit Yadav
44316f7398 ApiDiscovery: Fix tests and make constructor light weight, let spring run init() 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-06 20:07:27 +05:30
Hugo Trippaers
d296a8fa65 Revert "ApiDiscovery: Discovery apis provided by PluggableServices as well" 
This reverts commit 1b9e5c3006b5b9ee6b301d65fc8d81675914c826.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2013-02-06 14:17:22 +01:00
Rohit Yadav
1b9e5c3006 ApiDiscovery: Discovery apis provided by PluggableServices as well 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-06 16:54:46 +05:30
Rohit Yadav
dfcd9b05a0 ApiServer: Ask pluggable services to return list of apis to ApiServer 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-06 16:54:46 +05:30
Rohit Yadav
8c5cd42b56 ManagementServerImpl: Fix NPE, PluggableService should not return null list 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-06 16:54:46 +05:30
Rohit Yadav
d99f836d5d cli: Fix attribute error and fix helpdoc 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-06 16:54:46 +05:30
Kishan Kavala
2a0c2be136 CLOUDSTACK-1175: PlainTextAuthenticator was being loaded due @Component annotation. Removed the annotation so that MD5 authenticator will be used 2013-02-06 15:27:03 +05:30
Mice Xia
d65bfc56cd CLOUDSTACK-1174 rename field status-> state to comply with javabean convetion 2013-02-06 15:54:15 +08:00
Min Chen
5a2cd68fa8 Fix bug CLOUDSTACK-1171 due to spring injection. 2013-02-05 21:55:11 -08:00
Min Chen
1ce4d62ace Fix cast error from List<?> to array. 2013-02-05 21:44:38 -08:00
Sheng Yang
fda8ec3c59 IPv6: CLOUDSTACK-1153: Fix integer overflow on IPv6 address calcuation 
Use BigInteger, which is 128 bits long.
 2013-02-05 17:41:37 -08:00
radhikap
e81389a23e CLOUDPLATFORM-390 
Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
 2013-02-05 18:43:21 -06:00
anthony
db71d3da36 CLOUDSTACK-1167 
remove arptables rules after VM is stopped
 2013-02-05 15:07:29 -08:00
Hugo Trippaers
9d134f0f19 Summary: We need the integrity checkers to run 
The EncryptionSecretKeyChecker is required to load db.properties with
encrypted passwords.

Make usre the integrity checkers are run before anything else during
start-up
 2013-02-05 23:50:01 +01:00
Min Chen
b9cf5c2147 Merge branch 'master' into vim51_win8 2013-02-05 14:40:53 -08:00
Sheng Yang
f89dd9050c IPv6: CLOUDSTACK-1113: Fix the mechanism to find the usable IP in the IPv6 
The new policy is:
1. Generate a random IP.
2. Find the next available IP, start from the generated IP.
3. If we cannot find an available IP after certain times(10000 by default,
network.ipv6.search.retry.max) retry, give up.
 2013-02-05 14:31:12 -08:00
Sheng Yang
2e236a8322 IPv6: Fix ip address in range check 2013-02-05 14:31:06 -08:00
Kelven Yang
e5866cf2ef CLOUDSTACK-1165, fix nonoss build startup issue 2013-02-05 14:27:57 -08:00
Wido den Hollander
303fb650cb agent: Use FileUtil.readFileAsString for reading RX and TX bytes 
Since we already have this un utils it's better to use it here
then do the whole File/FileInputStream magic.

Keeps the code simpler and more readable.
 2013-02-05 22:17:40 +01:00
Hugo Trippaers
cb6b96cda2 Summary: Path changes for new rpm packaging 
The path to the keyfile was hardcoded, so added an alternative path for
compatibility with the packaging locations. Should ideally become a
setting in the config file.
 2013-02-05 20:49:02 +01:00
Marcus Sorensen
3535f88d16 Summary: Disallow shrinking volume type QCOW2 to fail with better message 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360093176 -0700
 2013-02-05 12:39:36 -07:00
Marcus Sorensen
4f274d0b8e Summary: resizeVolume needs to be available in UI 
Detail: Adds UI element for resizing a volume

BUG-ID: CLOUDSTACK-644
Reported-by: hongtu_zang@tcloudcomputing.com
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360091087 -0700
 2013-02-05 12:04:47 -07:00
Marcus Sorensen
750fb2c31e Summary: Fix improper variable assignment in resizevolume.sh (remove $) 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360089640 -0700
 2013-02-05 11:40:40 -07:00
Min Chen
a224287403 Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	pom.xml

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-02-05 10:05:39 -08:00
Prasanna Santhanam
7f885b65f9 CLOUDSTACK-1160: remove refs to invalid ACS release 
@since tag in API cmd /responses has been given an invalid ACS release
version. This fix removes these references.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-02-05 20:56:41 +05:30
Hugo Trippaers
0cc4636a2d Summary: packaging updates 
Empty paths lead to unpleasant surpises later on

Use basename to find the pid file when stopping tomcat
 2013-02-05 15:06:08 +01:00
Koushik Das
0ff6612f7f CLOUDSTACK-446 : Host going to alert state, if you are adding already added host 
Adding an already added host fails with error but in the process incorrectly updates the status of the host to 'Alert'. Put a check to prevent this.
 2013-02-05 19:11:22 +05:30
Jessica Tomechak
02217078b3 Doc. CLOUDSTACK-1152. Restore missing half of paragraph in Adding a Host. 2013-02-05 05:11:56 -08:00
Jessica Tomechak
66baa512ad Add Creating Network Offerings section to fix broken cross-reference that prevented docs from building. This section was already in the repo, but was not previously included in any book file. Removed stray reference to obsolete version number. 2013-02-05 05:11:54 -08:00
Jessica Tomechak
48691bae66 Remove workarounds and fix hyperlinks that were preventing docs from building. 2013-02-05 05:11:53 -08:00
Rohit Yadav
f97e2a6297 CLOUDSTACK-1066: Add definitions for building systemvm template appliance 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-05 18:02:52 +05:30
Kishan Kavala
0816a0bdea CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl 2013-02-05 17:18:23 +05:30
Kishan Kavala
fc0bf21a13 CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
Hugo Trippaers
2234e043e2 Summary: update packaging 
Change some paths to use the new cloudstack name
 2013-02-05 10:47:42 +01:00
Rohit Yadav
9cf5f9d780 Transaction: Fix better debug message 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-05 12:42:33 +05:30
Rohit Yadav
7795cfd759 Transaction: Fix NPE while reading db.properties file 
Handle NPE while setting up data source in Transaction

- This occured as Transaction is called it would run the following which
  assumed db.properties file, which may not be in one's classpath;

        // Initialize with assumed db.properties file
        initDataSource("db.properties");
- So, while this would be logged in logs, this is ignored for DatabaseCreator's
  case. In DatabaseCreator we call initDataSource with full path anyway.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-05 12:35:43 +05:30
Brian Federle
c61156e965 Providing invalid values for gateway, netmask etc in the zoneWizard blocks the VLAN container to load , throwing an error 2013-02-05 11:47:20 +05:30
Simon Waterhouse
9a44ecf777 CLOUDSTACK-1148: Change URL from google as 503 returns from that site cause test to erroneously fail. 
Signed-off-by: Simon Waterhouse <simon.waterhouse@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-05 10:43:38 +05:30