etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud
History
Remi Bergsma 75b68c6829 Merge release branch 4.7 to master 
* 4.7:
  Fix unable to setup more than one Site2Site VPN Connection
  FIX S2S VPN rVPC: Check only redundant routers in state MASTER
  PEP8 of integration/smoke/test_vpc_vpn
  Add S2S VPN test for Redundant VPC
  Make integration/smoke/test_vpc_vpn Hypervisor independant
  FIX VPN: non-working ipsec commands
  [UI] MADNESS
  [DB] Add force_encap field to s2s_customer_gateway table
  [ROUTER] Add forceencaps field to python router ipsec config method
  [TEST] unittest needs rework
  [MARVIN] Add forceencap field to VpnCustomerGateway class in marvin base
  [CORE] Add Force UDP Encapsulation option to Site2Site VPN
  CLOUDSTACK-9186: Root admin cannot see VPC created by Domain admin user
  CLOUDSTACK-9192: UpdateVpnCustomerGateway is failing
  CLOUDSTACK-6485 prevent ip asignment of private gw iface
  CLOUDSTACK-9204 Do not error when staticroute is already gone
  make both check lines consistent
  CLOUDSTACK-9181 Prevent syntax error in checkrouter.sh
  CLOUDSTACK-9202 Bump ssh timeout
 		2016-01-16 19:54:41 +01:00
..
account Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
acl Merge release branch 4.6 to master 2015-12-03 20:42:41 +01:00
agent/manager Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
alert Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
api Merge release branch 4.7 to master 2016-01-16 19:54:41 +01:00
async Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
capacity Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
configuration Merge release branch 4.6 to master 2015-12-12 22:29:19 +01:00
consoleproxy Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
dc Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
deploy Removed PlannerBase empty class 2015-12-01 11:45:23 -02:00
event Merge release branch 4.6 to master 2015-11-28 15:12:49 +01:00
ha Merge pull request #834 from maneesha-p/CLOUDSTACK-8866 2015-11-30 07:45:55 +01:00
hypervisor Merge branch '4.6' 2015-12-07 12:44:07 +05:30
metadata Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
network Merge release branch 4.7 to master 2016-01-16 19:54:41 +01:00
projects Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
resource Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
resourcelimit Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
server CLOUDSTACK-9106 - Makes Enum name compliant with Java code conventions. 2015-12-07 13:43:46 +01:00
servlet CLOUDSTACK-8656: reporting ignored exceptions in server 2015-08-04 15:50:35 +02:00
storage Merge release branch 4.6 to master 2015-12-12 22:29:19 +01:00
tags Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
template Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
test findbugs: use a prepared statement as prepared statement 2015-06-19 23:26:00 +02:00
usage Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
user CLOUDSTACK-8592: Implement Quota service 2015-12-07 23:02:48 +05:30
uuididentity CLOUDSTACK-6785: changed async job param injectedjobid to customjobid and check for unique/uuid 2014-05-27 15:23:12 -06:00
vm Merge release branch 4.6 to master 2015-12-12 22:29:19 +01:00