This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 9146d7b Merge branch '4.11'
add 3af54ec CLOUDSTACK-10382: Fix cloud-get-vm-data-configdrive.in (#2688)
add 99ca81a ui: do not send conserve mode on L2 network offering creation
from the UI (#2694)
add 76367db L2: add default L2 network offerings (#2683)
new 72e61bf Merge branch '4.11'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/com/cloud/offering/NetworkOffering.java | 4 ++
.../engine/orchestration/NetworkOrchestrator.java | 2 +
.../cloud/offerings/dao/NetworkOfferingDao.java | 5 ++
.../offerings/dao/NetworkOfferingDaoImpl.java | 48 +++++++++++++++++
.../storage/configdrive/ConfigDriveBuilder.java | 2 +-
.../com/cloud/server/ConfigurationServerImpl.java | 2 +
setup/bindir/cloud-get-vm-data-configdrive.in | 62 ++++++++++------------
ui/scripts/configuration.js | 16 ++++--
8 files changed, 101 insertions(+), 40 deletions(-)
--
To stop receiving notification emails like this one, please contact
ro...@apache.org.
