801e5269ea
Merge branch 'master' into vim51_win8
2013-02-28 14:25:26 -08:00
6f19895191
Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion.
...
Confirmed with Kishan about this.
2013-02-28 14:17:58 -08:00
e653c02515
Merge branch 'master' into ui-multiple-nics
2013-02-28 12:47:36 -08:00
97ca7791b3
Don't load from a fixed path, but load from the classpath so admins or packagers can overwrite the logging config
2013-02-28 21:28:46 +01:00
b1fcccc3f1
CLOUDSTACK-452: cloudstack UI - Zone Wizard - add IPv6 DNS1 field, IPv6 DNS2 field.
2013-02-28 12:07:33 -08:00
ac89c3e7e1
CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - guest network - network detail - View IP Ranges (only available in Advanced zone) - add IPv6 Start IP, IPv6 End IP field to listView and Add IP Range dialog.
2013-02-28 12:05:56 -08:00
5dd44b0dde
CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - create guest network - add IPv6 Gateway, IPv6 CIDR, IPv6 Start IP, IPv6 End IP field.
2013-02-28 12:05:12 -08:00
3f876060c0
CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - guest network - add IPv6 CIDR, IPv6 Gateway to listView and detailView.
2013-02-28 12:04:15 -08:00
5477d096d5
rpm packaging fix: Add symlink for log4j-cloud.xml in client webapp
...
web.xml now references a log4j-cloud.xml relative to the webapp root
to capture early logging from spring. This change introduces a symlink
in the client webapp to the system wide log4j-cloud.xml which works around
a problem starting cloud-management described in CLOUDSTACK-1436
CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]
Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:51:05 +00:00
9801667199
Revert classpath.conf.in to before .deb packaing merge
...
This change is apparently incompatible with the centos packaging,
temporarily reverting until we have discussed a proper fix
CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]
Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:45:46 +00:00
bcaac324aa
Rebase with master, bring into Vmware vswitch change.
2013-02-28 11:00:03 -08:00
f16347960a
rat: Fix the license, the mouse is squeaking, Nitin stepped on it :)
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 18:35:43 +05:30
01db2df23e
debian: Copy the 4.2 jar files to the destination directories.
...
This is FAR from perfect, but it works for now.
the VERSION variable returns 4.1 from the debian/changelog file, but in
the Maven configuration everything is already set to 4.2
So generated JAR files have 4.2.XX-SNAPSHOT in their name.
We probably want to find a better way to match this, extracting the version
somewhere out of Maven maybe?
2013-02-28 13:48:14 +01:00
ca6c1eba9c
debian: Require either Java 6 or 7
...
Our source is 1.6 compatible (pom.xml), but users can choose to compile
with JDK7 and run with JRE 7 if they want.
2013-02-28 13:48:14 +01:00
4446b9dff6
CLOUDSTACK-1221
2013-02-28 18:11:13 +05:30
e80ccea517
CLOUDSTACK-1340: Jenkins fails for changing directories, rvm sourcing fails
...
http://jenkins.cloudstack.org/job/build-systemvm-master/64/console
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:37:02 +05:30
54bfd7e04a
orchestration: Fix VirtualMachineEntityFactory to process spring injections
...
The bug was found was Harikrishna P. when iso was used, in case of Isos, the
create vm from scratch which fails due to factory being used to get the object
which is not spring injected
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:28:15 +05:30
44f345e4c6
CLOUDSTACK-1340: Fix destination path issue, vbox's internalcommands issue
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:55:41 +05:30
2081aa3100
CLOUDSTACK-658 - Adding Scalevm commands
2013-02-28 16:54:39 +05:30
80a6aaf7e1
CLOUDSTACK-1340: Fix locale, cmd, disk size and remove multiple apt-get installs
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:15:09 +05:30
6380e2004c
CLOUDSTACK-1340: apt-get autoclean and then clean to remove cached debs
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:02:44 +05:30
673700a1a2
CLOUDSTACK-1340: Fix raw disk export using vbox internalcommand
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 15:58:50 +05:30
1d31c3ecaf
CLOUDSTACK-241: Moved regions upgrade changes to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1.
...
Conflicts:
setup/db/db/schema-40to410.sql
2013-02-28 14:35:23 +05:30
6a46656c72
CLOUDSTACK-1448 Failed to start VM with standard vSwitch on VMware
2013-02-28 16:31:06 +08:00
9446eba78c
CLOUDSTACK-1447:Persistent Status is not displayed for VPC Tiers
2013-02-28 13:27:27 +05:30
644a73bb2f
CLOUDSTACK-1340: Don't remove all scripts in /root, rm only those copied by veewee
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 13:19:59 +05:30
b1fd371655
Vmware dvSwitch UI integration - tooltips
2013-02-28 12:16:50 +05:30
c25a0d8d8e
Displaying persistent network property in the detail view for VPC networks
2013-02-28 11:54:04 +05:30
680a360624
Merge branch 'dvswitch-UI'
2013-02-28 11:09:04 +05:30
398b049327
add license header for a js file reported by rat
2013-02-28 11:50:07 +08:00
e5bf4a8fc4
CLOUDSTACK-1434 BeanCreationException: Error creating bean with name 'apiRateLimitServiceImpl' when starting up mgmt server
2013-02-28 11:49:12 +08:00
91417115ef
CLOUDSTACK-1401 NPE: listCapacity
2013-02-28 11:46:10 +08:00
93f14e7c65
Merge branch 'master' into vim51_win8
...
Conflicts:
client/tomcatconf/componentContext.xml.in
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
9afd33d206
CLOUDSTACK-1418- As regular user , we are not allowed to deploy VM on a shared network.
...
- Added the access type attribute to @acl
- Domainchecker needs the AccessType.UseNetwork value specified to check access to network
2013-02-27 17:16:49 -08:00
36f4b44c36
Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in
...
new Spring framework and register it into internal dao map.
2013-02-27 15:47:07 -08:00
50f995f8b4
CLOUDSTACK-1170: Use a unified way to generate PublicIp
...
Tired of manually generate mac address everytime when create PublicIp object.
2013-02-27 14:20:26 -08:00
91d1835c6e
Merge branch 'ui-regions'
2013-02-27 13:51:00 -08:00
7d2ebc9fc3
Add some comments on some code source to give credit to vmware sample
...
code.
2013-02-27 13:46:43 -08:00
fd50578dec
CLOUDSTACK-1419: Add trademark to logos
2013-02-27 13:44:42 -08:00
612a598dcc
CLOUDSTACK-1419: Add trademark to logos
2013-02-27 13:44:07 -08:00
74c3f35d7d
Merge branch 'master' into ui-regions
2013-02-27 13:18:52 -08:00
699cb03308
CLOUDSTACK-1432:Inconsistent field names in the cluster dialog box
2013-02-28 02:25:31 +05:30
b07f482bac
dvswitch UI integration Complete:Enabling the flag - Set 4
2013-02-28 00:15:04 +05:30
08b2f7734b
dvswitch UI integration Complete - Set 4
2013-02-27 23:44:02 +05:30
fb9afaad2a
Add region UI: Don't use URL validation
...
Don't use URL validation for endpoint, becuase it doesn't accept
hostnames without domains (i.e., http://localhost:8080/client )
2013-02-27 09:13:28 -08:00
289c433cb9
Regions UI: Highlight active region in selector
2013-02-27 09:12:25 -08:00
fdaa5b4909
User accounts UI: Support for regions
...
-Add region select to add account form
-Show account's region in detail view
2013-02-27 08:59:55 -08:00
79bfbe32ce
Merge branch 'master' into ui-regions
2013-02-27 08:37:31 -08:00
8ba91fcd72
Summary: Fix RPM installation error for cloudstack-awsapi
...
Detail: getting "hard link not allowed for directory" due to line 321 in
cloud.spec. Changing to symlink.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361982798 -0700
2013-02-27 09:35:56 -07:00
0b7f2eb178
CLOUDSTACK-1410: Add a Unit test to verify if it actually works.
...
This is also the first Unit Test for LibvirtComputingResource
2013-02-27 17:34:06 +01:00
Min Chen
Brian Federle
Hugo Trippaers
Jessica Wang
Noa Resare
Rohit Yadav
Wido den Hollander
Radhika PC
Nitin Mehta
Kishan Kavala
Mice Xia
Pranav Saxena
Prachi Damle
Sheng Yang
Marcus Sorensen
Wido den Hollander