This is an automated email from the ASF dual-hosted git repository.

DaanHoogland pushed a change to branch ghi10752-config-core-3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard c19261df18f use ConfigKeys for network, stats collector, storage, user 
VM and account manager settings
 discard 0ddab003e79 use ConfigKeys for ManagementServer, agent, secondary 
storage and router settings
 discard 444050bfb39 use ConfigKeys for alert, storage, guest network and 
hidden settings
     add 86803e822be fix config descriptions and the 
NetworkLBHaproxyStatsVisibility name
     add 00cacc29a8a use ConfigKeys for alert, storage, guest network and 
hidden settings
     add fafd1ed8c4b remove a null check that can never be true
     add 28a6fc3b46a read usage alert settings from the DB, not 
ConfigKey.value()
     add 217fb988e95 use the renamed NetworkLBHaproxyStatsVisibility key
     add f44e26f97c1 use ConfigKeys for ManagementServer, agent, secondary 
storage and router settings
     add 847a93e2288 use ConfigKeys for network, stats collector, storage, user 
VM and account manager settings
     add 39c283252ec fix the publish.resource.state.events description

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c19261df18f)
            \
             N -- N -- N   refs/heads/ghi10752-config-core-3 (39c283252ec)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 api/src/main/java/com/cloud/storage/VolumeApiService.java            | 4 ++--
 .../engine/orchestration/service/NetworkOrchestrationService.java    | 2 +-
 .../src/main/java/com/cloud/network/NetworkStateListener.java        | 2 +-
 .../src/main/java/com/cloud/template/TemplateManager.java            | 2 +-
 .../src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java       | 2 +-
 .../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java  | 2 +-
 .../java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 4 ----
 .../java/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java    | 2 +-
 .../cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java     | 2 +-
 .../apache/cloudstack/network/tungsten/service/TungstenElement.java  | 2 +-
 .../cloudstack/network/tungsten/service/TungstenServiceImpl.java     | 2 +-
 .../cloudstack/network/tungsten/service/TungstenElementTest.java     | 2 +-
 .../src/main/java/com/cloud/network/router/CommandSetupHelper.java   | 2 +-
 server/src/main/java/com/cloud/server/ManagementServer.java          | 2 +-
 server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java | 2 +-
 usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java       | 5 +++--
 16 files changed, 18 insertions(+), 21 deletions(-)

Reply via email to