This is an automated email from the ASF dual-hosted git repository.
rajani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 18af707aeb675c48fec0e2be9b050e7baa456553
Merge: 0dc55f1 a2a1f25
Author: Rajani Karuturi <karut...@users.noreply.github.com>
AuthorDate: Tue Jun 6 16:16:10 2017 +0530
Merge pull request #1725 from yvsubhash/CLOUDSTACK-9559
CLOUDSTACK-9559 Why allow deleting zone without deleting the seconda…
engine/pom.xml | 2 +-
.../com/cloud/configuration/ConfigurationManagerImpl.java | 10 ++++++++--
.../com/cloud/configuration/ConfigurationManagerTest.java | 14 ++++++++++++++
server/test/resources/createNetworkOffering.xml | 2 +-
4 files changed, 24 insertions(+), 4 deletions(-)
diff --cc server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 214bedc,d7ab273..f6e040f
mode 100755,100644..100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.
