cloudstack: fix forward merge issues (#3394)

Browse Source

- Fixes tests path from old layout to standard maven in src/test/java/
- Removed duplicate SnapshotManagerImpl at old path `server/src/com...`

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

...

This commit is contained in:

Rohit Yadav 2019-06-12 16:38:58 +05:30 committed by GitHub

parent aecfe6d500

commit f30d716452

No known key found for this signature in database

GPG Key ID: 4AEE18F83AFDEB23

5 changed files with 0 additions and 1444 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

engine/storage/configdrive/test/org/apache/cloudstack/storage/configdrive/ConfigDriveTest.java → engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveTest.java

Unescape Escape View File

0

plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessorTest.java → plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessorTest.java

Unescape Escape View File

0

plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java → plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java

Unescape Escape View File

0

plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/LdapAuthenticatorTest.java → plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapAuthenticatorTest.java

Unescape Escape View File

1444

server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java

View File

File diff suppressed because it is too large Load Diff