cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [03/23] git commit: updated refs/heads/master to fc08c23
Date Fri, 19 Apr 2013 17:27:52 GMT
Merge branch 'master' into ui-mixed-zone-management


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

Branch: refs/heads/master
Commit: 3fef24d3e86b18ef03ca67179f03d00661e1e7cc
Parents: 4b853cc f66b9b5
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Apr 10 13:36:13 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Apr 10 13:36:13 2013 -0700

----------------------------------------------------------------------
 api/src/com/cloud/agent/api/to/FirewallRuleTO.java |    6 +
 .../cloud/entity/api/VMEntityManagerImpl.java      |    2 +-
 .../debian/config/etc/init.d/cloud-early-config    |   54 ++--
 .../element/JuniperSRXExternalFirewallElement.java |    2 +-
 .../cloud/network/resource/JuniperSrxResource.java |  322 +++++++++++----
 scripts/network/juniper/application-add.xml        |    2 +-
 scripts/network/juniper/security-policy-add.xml    |    4 +-
 scripts/vm/hypervisor/kvm/patchviasocket.pl        |    2 +-
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   39 +-
 .../network/ExternalFirewallDeviceManagerImpl.java |   12 +-
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |   60 +++
 .../definitions/systemvmtemplate/postinstall.sh    |   27 +-
 .../definitions/systemvmtemplate/preseed.cfg       |    8 +-
 .../definitions/systemvmtemplate64/postinstall.sh  |   27 +-
 .../definitions/systemvmtemplate64/preseed.cfg     |    8 +-
 15 files changed, 416 insertions(+), 159 deletions(-)
----------------------------------------------------------------------



Mime
View raw message