etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins/network-elements
History
Prachi Damle f84375442e Merge branch 'master' into rbac 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
 		2014-02-04 12:07:32 -08:00
..
bigswitch-vns All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
cisco-vnmc CLOUDSTACK-2560: Adding duplicate ASA device entity failure should be handled with API 2013-12-26 17:21:58 +05:30
dns-notifier Removed all reminants of the IdentityService. Created the KeysManager to move the management 2014-01-14 13:11:35 -08:00
elastic-loadbalancer Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators. 2014-01-20 13:37:52 -08:00
f5 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
internal-loadbalancer All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
juniper-contrail Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
juniper-srx Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
midonet Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
netscaler Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
nicira-nvp Merge branch 'master' into rbac 2014-02-04 12:07:32 -08:00
opendaylight Fix license formatting to work with the mycila license check for nvp and opendaylight 2014-01-22 11:24:37 +01:00
ovs All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
palo-alto Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
stratosphere-ssp add charset arg to InputStreamReader constructor 2014-01-31 12:57:13 +09:00
vxlan Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00