7c3ab31fbb
deploy docker vm without starting it
2014-04-03 01:49:31 +07:00
4ab0625c88
break systemvm flow
2014-04-03 01:11:24 +07:00
2ab75245de
changes to add a docker host
2014-03-31 00:56:48 +07:00
018215125b
add register Docker template
2014-03-29 15:28:38 +07:00
234831a996
fix building
2014-03-29 15:26:54 +07:00
cd4444cfec
init docker
2014-03-29 15:22:23 +07:00
d2bec2e14f
CLOUDSTACK-6245: the security group rule is lagging behind the rules in DB, due to there is a worker thread launched inside a transaction Reviewed-by: Alex
...
(cherry picked from commit d4fdc184fe
2014-03-17 16:27:25 -07:00
6a6ec64809
CLOUDSTACK-6232 allow expansion of ip on isolated networks as well
...
(cherry picked from commit edf97ac86c
2014-03-12 14:05:10 -07:00
4161650c6b
check-style: tabs to spaces(cherry picked from commit 0379dbb489)
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-12 11:17:41 -07:00
9af90e319d
[CLOUDSTACK-6232] bridging allowed in isolated networks
...
(cherry picked from commit f78e7ae51f
2014-03-12 11:03:22 -07:00
ec4db7bbff
CLOUDSTACK-6204: Removing realhostip.com dependency
...
For more info, see https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
Author: Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394399081 -0700
(cherry picked from commit 2fe7aeea23
2014-03-10 12:55:41 -07:00
859a78e1d3
CLOUDSTACK-6194: Failed to increase Shared network IP Range
...
Submitted-by:Saksham Srivastava <saksham.srivastava@citrix.com>
(cherry picked from commit 135247afd1
2014-03-10 10:15:04 -07:00
3b92031de9
CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
(cherry picked from commit 164ea3e84f
2014-03-10 10:02:19 -07:00
21172a2dc5
CLOUDSTACK-6205: VPC VR start - when create guest nics for the VR, consider networks not only in Implemented state, but in Setup state as well
...
(cherry picked from commit d009c8c7b229a1bb02834f52d9cac17f46e33349)
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-06 15:17:26 -08:00
e0e13434b9
CLOUDSTACK-5872: use List DS for storing NicProfiles as public network can have more than one nic
...
Conflicts:
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
2014-03-05 13:35:43 -08:00
3297fccea5
CLOUDSTACK-6186: Unable to register private template across all Zones - crosszones flag no longer works. This was because the code skipped the loop after the first download initiation. Introduced a set so that if it is already downloaded to the same zone then skip it for private template. Reviewed-by: Min
...
(cherry picked from commit 258d8e2a04
2014-03-04 23:43:45 -08:00
a1000b99ff
CLOUDSTACK-6187: Fixed MigrateSystemVMCmd response for router
...
(cherry picked from commit 37ce4e52c2
2014-03-04 23:43:21 -08:00
a8a36de4c8
CLOUDSTACK-6162:support OVS as connectivity service provider
...
adds 'Ovs' as network service provider in the physical network
(cherry picked from commit b8c4ed435a
2014-03-04 23:41:52 -08:00
26002ae69c
BUG-ID: CS-19152
...
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, destroy baremetal instance fail
BUG-ID: CS-19150
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to start baremetal instance
BUG-ID: CS-19149
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, baremetal host remain in Disconnected state. But instance associated with baremetal host is running.
BUG-ID: CS-19151
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to reboot baremetal instance
BUG-ID: CS-19156
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to stop baremetal instance
reviewed-by: edison
(cherry picked from commit 3787579d29
2014-03-04 23:36:17 -08:00
a10a0832b6
pass isSourceNat to second ip on the same network(cherry picked from commit 5af163ff7f)
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-13 15:54:57 -08:00
4961c1385a
CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
...
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
(cherry picked from commit f0b861fede
2014-02-07 13:21:39 -08:00
f93be7b2b6
CLOUDSTACK-5967: GRE tunnel creation is failing
...
after network orchestrator refactor, only network elements providingg
services as defined by network offering, are invloved network design and
imlement phase. So OVS network element need to be enables as
'Connectivity' service provider to make GRE tunnels work. This fix
introduced 'Ovs' provider as Connectivity service provider.
(cherry picked from commit 2e004878b1
2014-02-07 13:16:52 -08:00
31d1da5681
CLOUDSTACK-6007. Restore VM command fails with NPE.
...
If a VM instance is deployed with startVm=false, then calling restoreVm on the instance fails with NPE because CS tries to expunge a volume that has not been created in primary store.
(cherry picked from commit 92abb9439e
2014-02-07 13:13:49 -08:00
91ec548fc0
CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating
...
usage events are enabled
Signed-off-by: Daan Hoogland <daan@onecht.net>(cherry picked from commit 62a259ffa9
2014-02-02 16:10:35 -08:00
c0e70b51fc
CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75
...
and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to
different accounts" message while deleting multiple events .
(cherry picked from commit b811bc0945
2014-02-02 16:09:52 -08:00
8c45ab0761
findbugs Long comparison == -> equals()
...
(cherry picked from commit f4db8df66f
2014-01-31 19:17:58 +01:00
6aa3fd8a81
findbugs get from map with proper key-type
...
(cherry picked from commit a4f2f0b39f
2014-01-31 19:17:21 +01:00
5d11f9b149
findbugs explicit toString on enum for call get(Object)
...
(cherry picked from commit cce4a055ae
2014-01-31 19:16:55 +01:00
92ac450ca0
findbugs get proper object from map
...
(cherry picked from commit 901cf8ab32
2014-01-31 19:16:30 +01:00
f5f22c9d3b
findbugs: assign result of string manipulations
...
(cherry picked from commit 20127e09dc
2014-01-31 19:15:55 +01:00
d7e1d38d48
CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as "Failed to migrate the system vm".
...
(cherry picked from commit cff312ef74
2014-01-30 17:44:48 -08:00
ccc8aa78cd
CLOUDSTACK-5966 Updated service monitoring config to start by default.
...
Global settings EnableServiceMonitoring param set to true
(cherry picked from commit 7255e50f20
2014-01-30 17:42:42 -08:00
45e45b930a
LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller
...
Conflicts:
server/src/com/cloud/api/query/QueryManagerImpl.java
(cherry picked from commit b1d4c06ad1
2014-01-30 17:39:28 -08:00
210b19c1f5
Reverting this change as it caused issues with userVmResponse. "Findbugs: different issues solved"
...
This reverts commit dcda79e2c0
2014-01-30 15:33:31 -08:00
d6bbfbbc59
findbugs: nullpointer guards and wrappertype comparisons
2014-01-29 21:44:06 +01:00
dcda79e2c0
Findbugs: different issues solved
2014-01-29 21:40:21 +01:00
1fb32b58eb
findbugs: null-checks
2014-01-29 21:39:11 +01:00
eb239b9689
findbugs: retrieve the objects to remove from the collection(s)
2014-01-29 21:38:40 +01:00
594fd42d5d
findbugs fixes for ApiServer, ApiSerializerHelper and ApiXmlDocWriter
2014-01-29 21:36:46 +01:00
c3a63b6b5a
Findbugs issues in ApiResponseHelper fixes
2014-01-29 21:31:54 +01:00
da344bb234
restored imports
2014-01-29 21:29:50 +01:00
30b7fa5919
moved call on static object to synchronized block
2014-01-29 21:28:25 +01:00
5296c12d2a
nullpointer dereference guarded
2014-01-29 21:27:49 +01:00
85868d81fb
findbugs: null check for gateway and netmask instead of gateway twice(cherry picked from commit d30ddf6d59)
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:23:03 -08:00
63e839c0f8
CLOUDSTACK-5966 Added enable/disable monitoring service in global config
...
(cherry picked from commit 782265e713
2014-01-28 13:31:37 -08:00
3fa300b132
CS-5950: Wrong storage tags are used for ISO deployed VMs.
...
(cherry picked from commit 1f4e2a51a4
2014-01-28 13:25:14 -08:00
7e8b8e6cd0
CLOUDSTACK-5960: Domain admin or user cannot register a template using
...
S3/Swift object store.(cherry picked from commit 6d1475182c
2014-01-27 19:52:06 -08:00
8d1d0c54f2
CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view
...
Removed unused field. This will ensure that list VM queries are not blocked.
(cherry picked from commit 3fae917ebe
2014-01-27 19:51:04 -08:00
aa6f4dc8a7
CLOUDSTACK-5930: Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
server/src/com/cloud/server/auth/UserAuthenticator.java
server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit f160b31f51
2014-01-22 13:07:43 -08:00
d5e0dcd2a7
Revert "Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased"
...
This reverts commit 7884bb8aaf
2014-01-21 19:50:46 -08:00
tuna
Edison Su
Daan Hoogland
John Kinsella
Marcus Sorensen
Alena Prokharchyk
Nitin Mehta
Jayapal
Murali Reddy
Frank.Zhang
Daan Hoogland
Devdeep Singh
Likitha Shetty
David Grizzanti
Sanjay Tripathi
Animesh Chaturvedi
Min Chen
Koushik Das