cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [28/28] git commit: updated refs/heads/master to 75b68c6
Date Sat, 16 Jan 2016 18:55:35 GMT
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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/75b68c68
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/75b68c68
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/75b68c68

Branch: refs/heads/master
Commit: 75b68c68298dab270782be68f8f9f28e551fc5d0
Parents: f79b3e1 5fdc77e
Author: Remi Bergsma <github@remi.nl>
Authored: Sat Jan 16 19:54:41 2016 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Sat Jan 16 19:54:41 2016 +0100

----------------------------------------------------------------------
 .../cloud/network/Site2SiteCustomerGateway.java |   2 +
 .../org/apache/cloudstack/api/ApiConstants.java |   3 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java   |   5 +
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java   |   5 +
 .../Site2SiteCustomerGatewayResponse.java       |   6 +
 .../Site2SiteVpnConnectionResponse.java         |   9 +
 .../classes/resources/messages.properties       |   1 +
 .../classes/resources/messages_nl_NL.properties |   1 +
 .../api/routing/Site2SiteVpnCfgCommand.java     |  12 +-
 .../facade/Site2SiteVpnConfigItem.java          |   2 +-
 .../virtualnetwork/model/Site2SiteVpn.java      |  13 +-
 .../VirtualRoutingResourceTest.java             |   6 +-
 .../network/dao/Site2SiteCustomerGatewayVO.java |  15 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   3 +-
 .../network/router/CommandSetupHelper.java      |   3 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   3 +
 .../com/cloud/network/vpc/VpcManagerImpl.java   |   2 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |  13 +-
 setup/db/db/schema-470to471.sql                 |   1 +
 .../debian/config/opt/cloud/bin/checkrouter.sh  |  11 +-
 .../debian/config/opt/cloud/bin/configure.py    |  21 +-
 .../config/opt/cloud/bin/cs_site2sitevpn.py     |   2 +-
 .../config/opt/cloud/bin/cs_staticroutes.py     |   5 +-
 test/integration/smoke/test_vpc_vpn.py          | 539 +++++++++++++++++--
 tools/marvin/marvin/lib/base.py                 |   4 +
 ui/dictionary2.jsp                              |   3 +-
 ui/scripts/docs.js                              |   6 +-
 ui/scripts/network.js                           |  26 +-
 ui/scripts/vpc.js                               |  12 +-
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java  |   4 +-
 .../java/com/cloud/utils/ssh/SshHelper.java     |   4 +-
 31 files changed, 655 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75b68c68/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75b68c68/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75b68c68/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75b68c68/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------


Mime
View raw message