cloudstack/tools
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
..
apidoc Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 2015-12-21 22:09:31 +01:00
appliance changed the base iso file from debian-7.8.0 to debian-7.9.0 2015-09-15 21:37:44 +05:30
bugs-wiki fixing license headers in marvin 2012-07-04 18:45:08 -04:00
build build_asf.sh: fix debian changelog altering 2015-12-13 20:41:56 +01:00
checkstyle Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 2015-12-21 22:09:31 +01:00
cli tools: Remove cloudmonkey, add info in INSTALL.md 2013-07-28 22:53:12 +05:30
devcloud Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 2015-12-21 22:09:31 +01:00
devcloud-kvm Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 2015-12-21 22:09:31 +01:00
devcloud4 Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 2015-12-21 22:09:31 +01:00
docker squashed commit for dockerfiles part#2 including comments from PR#910 2015-10-28 22:34:31 -04:00
eclipse CLOUDSTACK-8433: remove awsapi db usage and add upgrade cleanup path 2015-05-06 15:22:04 +02:00
git Show actual diff in commits after merge 2015-12-12 11:22:32 +01:00
jira jira-changes.py: generate content for CHANGES.md from jira filter 2014-11-30 21:16:59 -05:00
logo README: happy holidays! 2015-12-23 13:27:40 +05:30
marvin Merge release branch 4.7 to master 2016-01-16 19:54:41 +01:00
ngui CLOUDSTACK-9048: Fix typo for public network description 2015-11-09 11:18:44 -06:00
transifex Update L10N resource files with 4.7 strings from Transifex (20151211) 2015-12-12 18:57:10 +00:00
travis Merge branch 'fixtravis3' of https://github.com/rsafonseca/cloudstack 2015-07-01 09:12:17 +02:00
utils/database_comparision_during_upgrade database_comparision_during_upgrade: add missing license header 2015-04-27 11:55:41 +02:00
vagrant Add missing license headers from recent branch merge 3c429ee 2015-03-18 11:03:54 +05:30
whisker Adding httpclient ssl source files to legal documentation 2013-08-26 12:36:59 -04:00
wix-cloudstack-maven-plugin Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 2015-12-21 22:09:31 +01:00
pom.xml Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 2015-12-21 22:09:31 +01:00