From 6f4503488be95d30727af9c69170fc9bac13ec1e Mon Sep 17 00:00:00 2001 From: John Bampton Date: Wed, 2 Aug 2023 21:47:21 +1000 Subject: [PATCH] pre-commit: apply `end-of-file-fixer` to all files (#7551) --- .pre-commit-config.yaml | 2 +- LICENSE | 1 - .../cloudstack/api-planner/module.properties | 2 +- .../allocator/spring-core-allocator-context.xml | 2 +- ...core-lifecycle-allocator-context-inheritable.xml | 2 +- .../cloudstack/direct-download/module.properties | 2 +- ...ring-core-lifecycle-core-context-inheritable.xml | 2 +- .../cloudstack/kubernetes/module.properties | 2 +- .../META-INF/cloudstack/planner/module.properties | 2 +- debian/cloudstack-cli.install | 2 +- debian/cloudstack-common.postinst | 2 +- debian/cloudstack-docs.install | 2 +- .../main/resources/META-INF/db/data-217to218.sql | 1 - .../main/resources/META-INF/db/schema-20to21.sql | 1 - .../resources/META-INF/db/schema-21to22-cleanup.sql | 2 -- .../resources/META-INF/db/schema-21to22-premium.sql | 3 --- .../main/resources/META-INF/db/schema-21to22.sql | 1 - .../resources/META-INF/db/schema-2210to2211.sql | 1 - .../resources/META-INF/db/schema-2211to2212.sql | 1 - .../resources/META-INF/db/schema-2212to2213.sql | 1 - .../resources/META-INF/db/schema-2213to2214.sql | 1 - .../META-INF/db/schema-2214to30-cleanup.sql | 1 - .../META-INF/db/schema-221to222-cleanup.sql | 1 - .../main/resources/META-INF/db/schema-221to222.sql | 2 -- .../META-INF/db/schema-222to224-premium.sql | 1 - .../main/resources/META-INF/db/schema-222to224.sql | 1 - .../main/resources/META-INF/db/schema-224to225.sql | 1 - .../main/resources/META-INF/db/schema-225to226.sql | 1 - .../META-INF/db/schema-227to228-premium.sql | 1 - .../main/resources/META-INF/db/schema-227to228.sql | 2 -- .../main/resources/META-INF/db/schema-228to229.sql | 2 -- .../META-INF/db/schema-22beta3to22beta4.sql | 2 -- .../META-INF/db/schema-304to305-cleanup.sql | 1 - .../META-INF/db/schema-305to306-cleanup.sql | 2 +- .../main/resources/META-INF/db/schema-306to307.sql | 2 +- .../META-INF/db/schema-307to410-cleanup.sql | 6 ------ .../META-INF/db/schema-40to410-cleanup.sql | 1 - .../main/resources/META-INF/db/schema-40to410.sql | 1 - .../META-INF/db/schema-41000to41100-cleanup.sql | 2 +- .../META-INF/db/schema-410to420-cleanup.sql | 2 -- .../resources/META-INF/db/schema-41110to41120.sql | 2 +- .../META-INF/db/schema-41500to41510-cleanup.sql | 1 - .../resources/META-INF/db/schema-41500to41510.sql | 1 - .../META-INF/db/schema-41510to41520-cleanup.sql | 1 - .../META-INF/db/schema-41600to41610-cleanup.sql | 2 +- .../META-INF/db/schema-41610to41700-cleanup.sql | 2 +- .../resources/META-INF/db/schema-41610to41700.sql | 2 +- .../META-INF/db/schema-41700to41710-cleanup.sql | 2 +- .../resources/META-INF/db/schema-41700to41710.sql | 2 +- .../META-INF/db/schema-421to430-cleanup.sql | 1 - .../main/resources/META-INF/db/schema-441to442.sql | 1 - .../META-INF/db/schema-442to450-cleanup.sql | 2 +- .../META-INF/db/schema-452to460-cleanup.sql | 1 - .../main/resources/META-INF/db/schema-452to460.sql | 2 -- .../main/resources/META-INF/db/schema-461to470.sql | 1 - .../main/resources/META-INF/db/schema-480to481.sql | 1 - .../META-INF/db/schema-481to490-cleanup.sql | 1 - .../META-INF/db/schema-490to4910-cleanup.sql | 1 - .../META-INF/db/schema-4910to4920-cleanup.sql | 1 - .../spring-engine-storage-snapshot-core-context.xml | 2 +- .../cloudstack/storage-allocator/module.properties | 2 +- .../spring-engine-storage-volume-core-context.xml | 2 +- .../volume/src/test/resource/testContext.xml | 2 +- .../core/spring-engine-userdata-core-context.xml | 2 +- framework/db/src/test/resources/db.properties | 2 +- framework/direct-download/pom.xml | 2 +- .../core/spring-framework-ipc-core-context.xml | 2 +- framework/jobs/src/test/resources/log4j.properties | 1 - .../testfiles/all/test2-defaults.properties | 1 - .../testfiles/missingname/module.properties | 1 - .../testhierarchy/excluded/module.properties | 2 +- .../testhierarchy/excluded2/module.properties | 2 +- .../orphan-of-excluded/defaults.properties | 2 +- .../orphan-of-excluded/module.properties | 2 +- packaging/centos7/cloud-ipallocator.rc | 1 - packaging/centos7/cloud.spec | 1 - packaging/centos8/cloud-ipallocator.rc | 1 - .../acl-project-role-based/module.properties | 2 +- .../acl-static-role-based/module.properties | 2 +- .../explicit-dedication/module.properties | 2 +- .../cloudstack/host-affinity/module.properties | 2 +- .../host-affinity/spring-host-affinity-context.xml | 2 +- .../cloudstack/host-anti-affinity/module.properties | 2 +- .../cloudstack/rate-limit/module.properties | 2 +- .../solidfire-intg-test/module.properties | 2 +- .../cloudstack/vmware-sioc/module.properties | 2 +- .../META-INF/cloudstack/networker/module.properties | 2 +- .../networker/spring-backup-networker-context.xml | 1 - .../implicit-dedication/module.properties | 2 +- .../user-concentrated-pod/module.properties | 2 +- .../spring-skip-heurestics-context.xml | 1 - .../host-allocator-random/module.properties | 2 +- .../cloudstack/baremetal-compute/module.properties | 2 +- .../baremetal-discoverer/module.properties | 2 +- .../cloudstack/baremetal-network/module.properties | 2 +- .../cloudstack/baremetal-planner/module.properties | 2 +- .../cloudstack/baremetal-storage/module.properties | 2 +- .../hyperv/DotNet/ServerResource/.gitignore | 1 - .../ServerResource/AgentShell/AgentShell.csproj | 2 +- .../DotNet/ServerResource/AgentShell/App.config | 2 +- .../ServerResource/AgentShell/packages.config | 2 +- .../HypervResource/HypervResource.csproj | 2 +- .../ServerResource/HypervResource/heartbeat.bat | 2 +- .../ServerResource/HypervResource/packages.config | 2 +- .../ServerResource/ServerResource.Tests/App.config | 2 +- .../ServerResource.Tests/packages.config | 2 +- .../ServerResource/WmiWrappers/WmiWrappers.csproj | 2 +- .../cloudstack/hyperv-compute/module.properties | 2 +- .../cloudstack/hyperv-discoverer/module.properties | 2 +- .../cloudstack/kvm-compute/module.properties | 2 +- .../cloudstack/ovm-compute/module.properties | 2 +- .../cloudstack/ovm-discoverer/module.properties | 2 +- .../main/scripts/vm/hypervisor/ovm/configureOvm.sh | 1 - .../cloudstack/simulator-compute/module.properties | 2 +- .../simulator-discoverer/module.properties | 2 +- .../cloudstack/simulator-storage/module.properties | 2 +- .../cloudstack/core/spring-vmware-core-context.xml | 2 +- .../cloudstack/vmware-compute/module.properties | 2 +- .../cloudstack/vmware-discoverer/module.properties | 2 +- .../cloudstack/vmware-network/module.properties | 2 +- .../spring-vmware-network-context.xml | 2 +- .../cloudstack/vmware-storage/module.properties | 2 +- .../cloudstack/xenserver-compute/module.properties | 2 +- .../xenserver-discoverer/module.properties | 2 +- .../META-INF/cloudstack/vcs/module.properties | 2 +- .../cloudstack/cisco-vnmc/module.properties | 2 +- .../scripts/network/cisco/create-acl-policy.xml | 2 +- .../main/scripts/network/cisco/create-ip-pool.xml | 2 +- .../META-INF/cloudstack/elb/module.properties | 2 +- .../META-INF/cloudstack/globodns/module.properties | 2 +- .../META-INF/cloudstack/contrail/module.properties | 2 +- .../src/test/resources/log4j.properties | 1 - .../src/test/resources/mysql_db_stop.sh | 2 -- .../src/test/resources/providerContext.xml | 2 +- .../src/test/resources/publicNetworkContext.xml | 2 +- .../META-INF/cloudstack/netscaler/module.properties | 2 +- .../META-INF/cloudstack/nvp/module.properties | 2 +- .../opendaylight/spring-opendaylight-context.xml | 1 - .../META-INF/cloudstack/paloalto/module.properties | 2 +- .../cloudstack/paloalto/spring-paloalto-context.xml | 2 +- .../META-INF/cloudstack/ssp/module.properties | 2 +- plugins/network-elements/tungsten/pom.xml | 2 +- .../META-INF/cloudstack/tungsten/module.properties | 2 +- .../tungsten/src/test/resources/log4j.properties | 1 - .../META-INF/cloudstack/vxlan/module.properties | 2 +- .../storage-image-default/module.properties | 2 +- .../cloudstack/storage-image-s3/module.properties | 2 +- .../storage-image-swift/module.properties | 2 +- .../storage-volume-cloudbyte/module.properties | 2 +- .../storage-volume-default/module.properties | 2 +- .../module.properties | 2 +- .../spring-storage-volume-nexenta-context.xml | 2 +- .../storage-volume-solidfire/module.properties | 2 +- .../META-INF/cloudstack/ldap/module.properties | 2 +- .../org/apache/cloudstack/ldap/LdapUserSpec.groovy | 2 +- .../NoLdapUserMatchingQueryExceptionSpec.groovy | 2 +- .../ldap/src/test/resources/cloudstack.org.ldif | 1 - .../ldap/src/test/resources/ldapunit.ldif | 2 +- .../ldap/src/test/resources/minimal.ldif | 1 - .../ldap/src/test/resources/unboundid.ldif | 1 - .../META-INF/cloudstack/md5/module.properties | 2 +- .../META-INF/cloudstack/plaintext/module.properties | 2 +- .../cloudstack/sha256salted/module.properties | 2 +- .../static-pin/pom.xml | 2 +- .../META-INF/cloudstack/staticpin/module.properties | 2 +- plugins/user-two-factor-authenticators/totp/pom.xml | 2 +- .../META-INF/cloudstack/totp/module.properties | 2 +- .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 - .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 - .../opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in | 1 - .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 - .../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 1 - .../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in | 1 - scripts/installer/export-templates.sh | 1 - scripts/network/juniper/dest-nat-rule-getone.xml | 2 -- .../juniper/firewall-filter-bytes-getall.xml | 1 - scripts/network/juniper/src-nat-rule-add.xml | 2 -- scripts/network/juniper/src-nat-rule-getall.xml | 1 - scripts/network/juniper/src-nat-rule-getone.xml | 2 -- scripts/network/juniper/static-nat-rule-add.xml | 2 -- scripts/network/juniper/static-nat-rule-getall.xml | 2 -- scripts/network/juniper/static-nat-rule-getone.xml | 2 -- scripts/network/juniper/test.xml | 1 - scripts/network/juniper/zone-interface-add.xml | 1 - scripts/network/juniper/zone-interface-getone.xml | 1 - scripts/storage/qcow2/managevolume.sh | 2 -- scripts/storage/secondary/setup-sysvm-tmplt | 2 +- scripts/vm/hypervisor/kvm/nsrkvmbackup.sh | 2 +- scripts/vm/hypervisor/kvm/nsrkvmrestore.sh | 2 +- .../xenserver/add_to_vcpus_params_live.sh | 1 - .../vm/hypervisor/xenserver/cloud-plugin-storage | 1 - .../hypervisor/xenserver/cloud-prepare-upgrade.sh | 1 - .../vm/hypervisor/xenserver/cloud-setup-bonding.sh | 1 - scripts/vm/hypervisor/xenserver/cloudlog | 1 - scripts/vm/hypervisor/xenserver/make_migratable.sh | 2 -- scripts/vm/hypervisor/xenserver/network_info.sh | 1 - scripts/vm/hypervisor/xenserver/ovstunnel | 2 +- scripts/vm/hypervisor/xenserver/setup_iscsi.sh | 1 - scripts/vm/hypervisor/xenserver/setupxenserver.sh | 1 - .../vm/hypervisor/xenserver/upgrade_vnc_config.sh | 1 - scripts/vm/hypervisor/xenserver/vmopsSnapshot | 1 - scripts/vm/hypervisor/xenserver/xcposs/patch | 2 +- scripts/vm/hypervisor/xenserver/xcpserver/patch | 2 +- scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 2 +- scripts/vm/hypervisor/xenserver/xenserver60/patch | 2 +- scripts/vm/hypervisor/xenserver/xenserver62/patch | 2 +- scripts/vm/hypervisor/xenserver/xenserver65/patch | 2 +- scripts/vm/hypervisor/xenserver/xs_cleanup.sh | 1 - scripts/vm/network/ovs-pvlan-cleanup.sh | 1 - scripts/vm/network/ovs-pvlan-vm.sh | 1 - .../vm/network/tungsten/setup_tungsten_vrouter.sh | 2 +- server/conf/cloudstack-catalina.logrotate | 2 +- .../core/spring-server-core-misc-context.xml | 2 +- .../server-alert-adapter-backend/module.properties | 2 +- .../server-alert-adapter-compute/module.properties | 2 +- .../server-alert-adapter-storage/module.properties | 2 +- .../cloudstack/server-allocator/module.properties | 2 +- .../cloudstack/server-api/module.properties | 2 +- .../server-api/spring-server-api-context.xml | 2 +- .../cloudstack/server-compute/module.properties | 2 +- .../cloudstack/server-discoverer/module.properties | 2 +- .../cloudstack/server-fencer/module.properties | 2 +- .../server-investigator/module.properties | 2 +- .../cloudstack/server-network/module.properties | 2 +- .../cloudstack/server-planner/module.properties | 2 +- .../cloudstack/server-storage/module.properties | 2 +- .../server-template-adapter/module.properties | 2 +- .../system/spring-server-system-context.xml | 2 +- services/console-proxy/rdpconsole/rdp-config.bat | 1 - .../rdpconsole/src/test/doc/dev-rdp-config.bat | 1 - .../secondary-storage-discoverer/module.properties | 2 +- setup/bindir/cloud-sysvmadm.in | 2 -- setup/db/221to222upgrade.sh | 2 -- setup/db/create-schema.sql | 1 - setup/db/index-20to21.sql | 1 - setup/db/index-212to213.sql | 1 - setup/db/templates.sql | 1 - systemvm/agent/certs/realhostip.key | 2 +- systemvm/agent/js/jquery.js | 2 +- systemvm/agent/noVNC/app/locale/cs.json | 2 +- systemvm/agent/noVNC/app/locale/de.json | 2 +- systemvm/agent/noVNC/app/locale/el.json | 2 +- systemvm/agent/noVNC/app/locale/es.json | 2 +- systemvm/agent/noVNC/app/locale/fr.json | 2 +- systemvm/agent/noVNC/app/locale/it.json | 2 +- systemvm/agent/noVNC/app/locale/ja.json | 2 +- systemvm/agent/noVNC/app/locale/ko.json | 2 +- systemvm/agent/noVNC/app/locale/nl.json | 2 +- systemvm/agent/noVNC/app/locale/pl.json | 2 +- systemvm/agent/noVNC/app/locale/pt_BR.json | 2 +- systemvm/agent/noVNC/app/locale/ru.json | 2 +- systemvm/agent/noVNC/app/locale/sv.json | 2 +- systemvm/agent/noVNC/app/locale/tr.json | 2 +- systemvm/agent/noVNC/app/locale/zh_CN.json | 2 +- systemvm/agent/noVNC/app/locale/zh_TW.json | 2 +- systemvm/agent/noVNC/core/input/uskeysym.js | 2 +- systemvm/agent/noVNC/core/ra2.js | 2 +- systemvm/agent/noVNC/core/util/md5.js | 2 +- systemvm/debian/etc/modprobe.d/pcspkr.conf | 2 +- .../system/hyperv-daemons.hv-fcopy-daemon.service | 2 +- .../system/hyperv-daemons.hv-kvp-daemon.service | 2 +- systemvm/debian/opt/cloud/bin/getRouterAlerts.sh | 2 +- systemvm/debian/opt/cloud/bin/patched.sh | 2 +- systemvm/debian/opt/cloud/bin/setup/cksnode.sh | 2 +- .../debian/opt/cloud/bin/update_interface_config.sh | 2 +- systemvm/debian/opt/cloud/testdata/vmp0001.json | 2 +- test/metadata/func/templates_sync.xml | 3 --- test/scripts/bootstrap-regression.sh | 2 +- test/scripts/build-env.sh | 2 -- test/scripts/checkOutOfMemory.sh | 2 +- test/scripts/cleanparallel.sh | 3 --- test/scripts/deploy-and-run-regression.sh | 1 - test/scripts/deploycluster.sh | 5 ----- test/scripts/executeUserAPI.sh | 2 -- test/scripts/run.sh | 1 - test/scripts/usage/allocated.sh | 1 - test/scripts/usage/volume_usage.sh | 2 -- test/scripts/xen/corrupttemplate.sh | 2 +- test/scripts/xen/createfaketemplate.sh | 2 +- test/scripts/xen/killvm.sh | 2 +- test/scripts/xen/listtemplate.sh | 2 +- test/scripts/xen/listvdi.sh | 2 +- test/scripts/xen/listvm.sh | 2 +- test/scripts/xen/ms.sh | 2 +- test/scripts/xen/removetemplate.sh | 2 +- test/scripts/xen/shutdown.sh | 2 +- test/scripts/xen/sleep.sh | 2 +- tools/apidoc/generatecommand.xsl | 1 - tools/apidoc/generatecustomcommand.xsl | 1 - tools/apidoc/generategenericcommand.xsl | 1 - tools/apidoc/generatetoc.xsl | 1 - tools/devcloud4/.gitignore | 2 +- .../binary-installation-advanced/Berksfile | 2 +- .../binary-installation-advanced/marvin.cfg.erb | 2 +- tools/devcloud4/binary-installation-basic/Berksfile | 2 +- .../binary-installation-basic/marvin.cfg.erb | 2 +- .../binary-installation/attributes/default.rb | 2 +- .../binary-installation/recipes/database_server.rb | 1 - .../common/binary-installation/recipes/default.rb | 2 +- .../development-installation/attributes/default.rb | 2 +- .../recipes/database_server.rb | 1 - .../development-installation/recipes/default.rb | 2 +- .../recipes/system_templates.rb | 2 +- tools/devcloud4/prefill.sql | 2 +- tools/docker/Dockerfile.smokedev | 2 +- tools/eclipse/set-eclipse-profile.sh | 2 +- tools/git/prepare-commit-msg | 1 - tools/marvin/marvin/misc/build/vm-start.sh | 1 - tools/ngui/static/bootstrap/js/bootstrap.min.js | 2 +- tools/ngui/static/js/app/dashboard/dashboard.js | 1 - .../static/js/app/infrastructure/infrastructure.js | 1 - tools/ngui/static/js/lib/angular.js | 2 +- tools/transifex/.tx/config | 1 - tools/transifex/sync-transifex-ui.sh | 1 - .../database_comparision_during_upgrade/README | 1 - .../before_upgrade_data_collection.sh | 2 -- .../fresh_install_data_collection.sh | 1 - .../test_config_before_and_after_upgrade.sh | 1 - .../test_config_between_fresh_and_upgraded_setup.sh | 13 ------------- .../usage_schema_comparison.sh | 1 - tools/whisker/LICENSE | 1 - ui/.babelrc | 2 +- ui/.gitattributes | 2 +- ui/public/assets/banner.svg | 2 +- ui/public/assets/logo.svg | 2 +- ui/public/assets/mini-logo.svg | 2 +- ui/public/config.json | 2 +- ui/public/js/less.min.js | 2 +- ui/public/locales/ar.json | 2 +- ui/public/locales/ca.json | 2 +- ui/public/locales/de_DE.json | 2 +- ui/public/locales/el_GR.json | 2 +- ui/public/locales/es.json | 2 +- ui/public/locales/fr_FR.json | 2 +- ui/public/locales/hi.json | 2 +- ui/public/locales/hu.json | 2 +- ui/public/locales/it_IT.json | 2 +- ui/public/locales/ko_KR.json | 2 +- ui/public/locales/nb_NO.json | 2 +- ui/public/locales/nl_NL.json | 2 +- ui/public/locales/pl.json | 2 +- ui/public/locales/pt_BR.json | 2 +- ui/public/locales/ru_RU.json | 2 +- ui/public/locales/zh_CN.json | 2 +- ui/src/assets/icons/dark.svg | 2 +- ui/src/assets/icons/debian.svg | 2 +- ui/src/assets/icons/kubernetes.svg | 2 +- ui/src/assets/icons/light.svg | 2 +- ui/src/components/multitab/index.less | 2 +- ui/src/style/common/function.less | 2 +- ui/src/style/dark-mode.less | 2 +- ui/src/style/frame/content.less | 2 +- ui/src/style/frame/search.less | 2 +- ui/src/style/frame/sider.less | 2 +- ui/src/style/frame/top-menu.less | 2 +- ui/src/style/objects/table.less | 2 +- ui/src/style/vars.less | 2 +- ui/tests/mockData/ActionButton.mock.json | 2 +- ui/tests/mockData/MigrateWizard.mock.json | 2 +- 359 files changed, 235 insertions(+), 408 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 773507c3d9f..75014782442 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -36,7 +36,7 @@ repos: #- id: check-yaml #- id: detect-private-key - id: end-of-file-fixer - files: \.(java|md|py|txt|yaml|yml)$ + exclude: \.vhd$ #- id: fix-byte-order-marker - id: mixed-line-ending files: \.(java|md|py|txt|yaml|yml)$ diff --git a/LICENSE b/LICENSE index 48d852652c3..8be7d8083a5 100644 --- a/LICENSE +++ b/LICENSE @@ -624,4 +624,3 @@ Within the utils/src/main/java/org/apache/commons/httpclient/contrib/ssl directo from The Apache Software Foundation http://www.apache.org/ EasySSLProtocolSocketFactory.java EasyX509TrustManager.java - diff --git a/api/src/main/resources/META-INF/cloudstack/api-planner/module.properties b/api/src/main/resources/META-INF/cloudstack/api-planner/module.properties index 8eed8791149..a2073870e82 100644 --- a/api/src/main/resources/META-INF/cloudstack/api-planner/module.properties +++ b/api/src/main/resources/META-INF/cloudstack/api-planner/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=api-planner -parent=planner \ No newline at end of file +parent=planner diff --git a/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml index 0e00fda4af0..a0d1b4cfd43 100644 --- a/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml +++ b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml index cd98a636706..ec3bb63aeb6 100644 --- a/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml +++ b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml @@ -41,4 +41,4 @@ value="com.cloud.consoleproxy.ConsoleProxyAllocator" /> - \ No newline at end of file + diff --git a/core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/module.properties b/core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/module.properties index 63e1a8b604f..cdd8e2e09e0 100644 --- a/core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/module.properties +++ b/core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/module.properties @@ -18,4 +18,4 @@ # name=direct-download -parent=backend \ No newline at end of file +parent=backend diff --git a/core/src/main/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml index 3e57a01e211..71d16566723 100644 --- a/core/src/main/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml +++ b/core/src/main/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml @@ -45,4 +45,4 @@ - \ No newline at end of file + diff --git a/core/src/main/resources/META-INF/cloudstack/kubernetes/module.properties b/core/src/main/resources/META-INF/cloudstack/kubernetes/module.properties index ea954a9573a..09f265bef74 100644 --- a/core/src/main/resources/META-INF/cloudstack/kubernetes/module.properties +++ b/core/src/main/resources/META-INF/cloudstack/kubernetes/module.properties @@ -18,4 +18,4 @@ # name=kubernetes -parent=compute \ No newline at end of file +parent=compute diff --git a/core/src/main/resources/META-INF/cloudstack/planner/module.properties b/core/src/main/resources/META-INF/cloudstack/planner/module.properties index 26c61d9e8ea..02a26061f2b 100644 --- a/core/src/main/resources/META-INF/cloudstack/planner/module.properties +++ b/core/src/main/resources/META-INF/cloudstack/planner/module.properties @@ -18,4 +18,4 @@ # name=planner -parent=allocator \ No newline at end of file +parent=allocator diff --git a/debian/cloudstack-cli.install b/debian/cloudstack-cli.install index 287f9b1f651..978b68af62a 100644 --- a/debian/cloudstack-cli.install +++ b/debian/cloudstack-cli.install @@ -13,4 +13,4 @@ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. \ No newline at end of file +# under the License. diff --git a/debian/cloudstack-common.postinst b/debian/cloudstack-common.postinst index 360f3bd6c11..aa99edaee06 100644 --- a/debian/cloudstack-common.postinst +++ b/debian/cloudstack-common.postinst @@ -32,4 +32,4 @@ fi cp $CLOUDUTILS_DIR/cloud_utils.py $DIST_DIR cp -R $CLOUDUTILS_DIR/cloudutils $DIST_DIR python3 -m py_compile $DIST_DIR/cloud_utils.py -python3 -m compileall $DIST_DIR/cloudutils \ No newline at end of file +python3 -m compileall $DIST_DIR/cloudutils diff --git a/debian/cloudstack-docs.install b/debian/cloudstack-docs.install index 287f9b1f651..978b68af62a 100644 --- a/debian/cloudstack-docs.install +++ b/debian/cloudstack-docs.install @@ -13,4 +13,4 @@ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. \ No newline at end of file +# under the License. diff --git a/engine/schema/src/main/resources/META-INF/db/data-217to218.sql b/engine/schema/src/main/resources/META-INF/db/data-217to218.sql index a6bb1eaf66c..5c1253143f4 100755 --- a/engine/schema/src/main/resources/META-INF/db/data-217to218.sql +++ b/engine/schema/src/main/resources/META-INF/db/data-217to218.sql @@ -17,4 +17,3 @@ INSERT INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'default.page.size', '500', 'Default page size for API list* commands'); DELETE FROM `cloud`.`op_host_capacity` WHERE `capacity_type` in (2,6); - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql b/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql index cc41910e567..7013046ca43 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql @@ -198,4 +198,3 @@ CREATE TABLE `cloud`.`disk_offering_21` ( `created` datetime COMMENT 'date the disk offering was created', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql index 9cfc10ad572..c8757833fab 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql @@ -79,5 +79,3 @@ UPDATE `cloud`.`vm_instance` SET last_host_id=NULL WHERE last_host_id NOT IN (SE UPDATE `cloud`.`vm_instance` SET domain_id=1, account_id=1 where account_id not in (select distinct id from account) or domain_id not in (select distinct id from domain); ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__account_id` FOREIGN KEY `fk_vm_instance__account_id` (`account_id`) REFERENCES `account` (`id`); - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql b/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql index 9fb9859b2f0..45202840565 100755 --- a/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql @@ -76,6 +76,3 @@ CREATE TABLE `cloud_usage`.`usage_network_offering` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; update `cloud_usage`.`usage_volume` set size = (size * 1048576); - - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql b/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql index 7ab72287484..c0cf656addd 100755 --- a/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql @@ -1016,4 +1016,3 @@ INSERT INTO configuration (category, instance, component, name, value, descripti DELETE FROM load_balancer_vm_map WHERE load_balancer_id NOT IN (SELECT id FROM load_balancer); DELETE FROM vm_instance WHERE type='User' AND id NOT IN (SELECT id FROM user_vm); - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql b/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql index 45ebdf7778d..01bec020d63 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql @@ -14,4 +14,3 @@ -- KIND, either express or implied. See the License for the -- specific language governing permissions and limitations -- under the License. - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql index 71eca10158f..94c3d75a29f 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql @@ -60,4 +60,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`inline_load_balancer_nic_map` ( CONSTRAINT `fk_inline_load_balancer_nic_map__load_balancer_id` FOREIGN KEY(`load_balancer_id`) REFERENCES `load_balancing_rules`(`id`) ON DELETE CASCADE, CONSTRAINT `fk_inline_load_balancer_nic_map__nic_id` FOREIGN KEY(`nic_id`) REFERENCES `nics`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql b/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql index cb32e90e52c..a94f60c7381 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql @@ -80,4 +80,3 @@ INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-serv INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.destory.forcestop', 'false', 'On destory, force-stop takes this value'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.lock.timeout', '600', 'Lock wait timeout (seconds) while implementing network'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.disable.rpfilter','true','disable rp_filter on Domain Router VM public interfaces.'); - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql b/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql index de391d3e322..6c0cc4b6c70 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql @@ -87,4 +87,3 @@ ALTER TABLE `cloud_usage`.`user_statistics` MODIFY `device_type` varchar(32) NOT ALTER TABLE `cloud`.`keystore` ADD seq int; ALTER TABLE `cloud`.`keystore` MODIFY `cloud`.`keystore`.`key` text; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql index 6b05e9abd39..c90707c75b7 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql @@ -65,4 +65,3 @@ DROP TABLE IF EXISTS `cloud`.`network_tags`; DROP TABLE IF EXISTS `cloud_usage`.`event`; DELETE from `cloud`.`guest_os` where id=204 or id=205; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql index 5908dbb78fa..d999b939103 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql @@ -17,4 +17,3 @@ alter table firewall_rules drop column is_static_nat; delete from configuration where name='router.cleanup'; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql b/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql index c4fb804886e..0c663b1ca03 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql @@ -52,5 +52,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`version` ( PRIMARY KEY (`id`), INDEX `i_version__version`(`version`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql b/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql index 931ca42ec56..9a5f62794c4 100755 --- a/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql @@ -21,4 +21,3 @@ ALTER TABLE `cloud_usage`.`usage_vm_instance` ADD COLUMN `hypervisor_type` varchar(255); ALTER TABLE `cloud_usage`.`usage_event` ADD COLUMN `resource_type` varchar(32); - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql b/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql index 439fd6d2684..8be64169b44 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql @@ -193,4 +193,3 @@ UPDATE `cloud`.`nics` SET strategy='Create' where reserver_name='DirectNetworkGu UPDATE storage_pool SET cluster_id=(SELECT cluster_id FROM host INNER JOIN storage_pool_host_ref WHERE host.id=storage_pool_host_ref.host_id AND storage_pool_host_ref.pool_id=storage_pool.id) WHERE pool_type='LVM'; UPDATE `cloud`.`host` SET resource='com.cloud.hypervisor.xen.resource.XenServer56FP1Resource' WHERE resource='com.cloud.hypervisor.xen.resource.XenServer56FP1PremiumResource'; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql b/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql index a4eff69b6aa..65334af306f 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql @@ -64,4 +64,3 @@ ALTER TABLE `cloud`.`user_statistics` MODIFY `device_id` bigint(20) unsigned NOT ALTER TABLE `cloud`.`user_statistics` MODIFY `device_type` varchar(32) NOT NULL; ALTER TABLE `cloud`.`nics` MODIFY `ip6_address` char(40); - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql b/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql index a991ecebc2c..49f948c7b29 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql @@ -49,4 +49,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`cmd_exec_log` ( INDEX `i_cmd_exec_log__instance_id`(`instance_id`), CONSTRAINT `fk_cmd_exec_log_ref__inst_id` FOREIGN KEY (`instance_id`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql b/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql index 26d555e59a8..40fcbfa6838 100755 --- a/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql @@ -34,4 +34,3 @@ drop table `cloud_usage`.`temp_usage`; update `cloud_usage`.`cloud_usage` set raw_usage = (raw_usage % 24) where usage_type =6 and raw_usage > 24 and (raw_usage % 24) <> 0; update `cloud_usage`.`cloud_usage` set raw_usage = 24 where usage_type =6 and raw_usage > 24 and (raw_usage % 24) = 0; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql b/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql index c0b3eb12a2f..6828bd1abe6 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql @@ -164,5 +164,3 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Console Proxy', 'DEFAULT', 'AgentManager', 'consoleproxy.management.state', 'Auto', 'console proxy service management state'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Console Proxy', 'DEFAULT', 'AgentManager', 'consoleproxy.management.state.last', 'Auto', 'last console proxy service management state'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'cluster.message.timeout.seconds', '300', 'Time (in seconds) to wait before a inter-management server message post times out.'); - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql b/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql index d448f03ca29..edc46c0e46b 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql @@ -92,5 +92,3 @@ CREATE TABLE `cloud`.`elastic_lb_vm_map` ( CONSTRAINT `fk_elastic_lb_vm_map__elb_vm_id` FOREIGN KEY `fk_elastic_lb_vm_map__elb_vm_id` (`elb_vm_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE, CONSTRAINT `fk_elastic_lb_vm_map__lb_id` FOREIGN KEY `fk_elastic_lb_vm_map__lb_id` (`lb_id`) REFERENCES `load_balancing_rules` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql b/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql index 2160878e687..c73d16537ac 100755 --- a/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql @@ -124,5 +124,3 @@ ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group___account DROP VIEW `cloud`.`user_ip_address_view`; CREATE VIEW `cloud`.`user_ip_address_view` AS SELECT INET_NTOA(user_ip_address.public_ip_address) as ip_address, user_ip_address.data_center_id, user_ip_address.account_id, user_ip_address.domain_id, user_ip_address.source_nat, user_ip_address.allocated, user_ip_address.vlan_db_id, user_ip_address.one_to_one_nat, user_ip_address.state, user_ip_address.mac_address, user_ip_address.network_id as associated_network_id from user_ip_address; - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql index b019ac2b521..3b5c8f5a356 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql @@ -19,4 +19,3 @@ ALTER TABLE `cloud`.`domain_router` DROP COLUMN network_id; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql index 2afbc27b822..f15ad4fbc5c 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql @@ -23,4 +23,4 @@ DELETE FROM `cloud`.`configuration` where `cloud`.`configuration`.`name`="vm.hos DELETE FROM `cloud`.`storage_pool_host_ref` WHERE `cloud`.`storage_pool_host_ref`.`pool_id` IN (SELECT `cloud`.`storage_pool`.`id` FROM `cloud`.`storage_pool` WHERE `cloud`.`storage_pool`.`removed` IS NOT NULL); ALTER TABLE `cloud`.`sync_queue` DROP COLUMN queue_proc_msid; -ALTER TABLE `cloud`.`sync_queue` DROP COLUMN queue_proc_time; \ No newline at end of file +ALTER TABLE `cloud`.`sync_queue` DROP COLUMN queue_proc_time; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql b/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql index bad23c16bc0..a43833efa43 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql @@ -19,4 +19,4 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.max.conn', '4096', 'Load Balancer(haproxy) maximum number of concurrent connections(global max)'); -ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `concurrent_connections` int(10) unsigned COMMENT 'concurrent connections supported on this network'; \ No newline at end of file +ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `concurrent_connections` int(10) unsigned COMMENT 'concurrent connections supported on this network'; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-307to410-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-307to410-cleanup.sql index 6a9e2af9588..4b00fde5fdd 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-307to410-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-307to410-cleanup.sql @@ -35,9 +35,3 @@ ALTER TABLE `cloud_usage`.`cloud_usage` CHANGE COLUMN `virtual_size1` `virtual_s ALTER TABLE `cloud`.`network_offerings` DROP COLUMN `concurrent_connections`; ALTER TABLE `cloud`.`network_offerings` CHANGE COLUMN `concurrent_connections1` `concurrent_connections` int(10) unsigned COMMENT 'Load Balancer(haproxy) maximum number of concurrent connections(global max)'; - - - - - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-40to410-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-40to410-cleanup.sql index 411b568de4a..a10361b8f5d 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-40to410-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-40to410-cleanup.sql @@ -18,4 +18,3 @@ --; -- Schema cleanup from 4.0.0 to 4.1.0; --; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql b/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql index 3d6dc654256..1b3a29b27a4 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql @@ -1668,4 +1668,3 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag UPDATE `cloud`.`configuration` set category='Advanced' where category='Advanced '; UPDATE `cloud`.`configuration` set category='Hidden' where category='Hidden '; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql index f8d9ce9b73b..d7a080efd16 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql @@ -66,4 +66,4 @@ CREATE VIEW `cloud`.`user_view` AS left join `cloud`.`async_job` ON async_job.instance_id = user.id and async_job.instance_type = 'User' - and async_job.job_status = 0; \ No newline at end of file + and async_job.job_status = 0; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-410to420-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-410to420-cleanup.sql index b65717f3593..2a7ab6ae14f 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-410to420-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-410to420-cleanup.sql @@ -24,5 +24,3 @@ ALTER TABLE `cloud`.`remote_access_vpn` DROP foreign key `fk_remote_access_vpn__ ALTER TABLE `cloud`.`remote_access_vpn` DROP primary key; ALTER TABLE `cloud`.`remote_access_vpn` ADD primary key (`id`); ALTER TABLE `cloud`.`remote_access_vpn` ADD CONSTRAINT `fk_remote_access_vpn__vpn_server_addr_id` FOREIGN KEY (`vpn_server_addr_id`) REFERENCES `user_ip_address` (`id`); - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41110to41120.sql b/engine/schema/src/main/resources/META-INF/db/schema-41110to41120.sql index 8b1b9d9cc31..110d13df182 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41110to41120.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41110to41120.sql @@ -27,4 +27,4 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis ALTER TABLE `cloud`.`user_vm_clone_setting` ADD COLUMN `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT FIRST, DROP PRIMARY KEY, -ADD PRIMARY KEY (`id`); \ No newline at end of file +ADD PRIMARY KEY (`id`); diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41500to41510-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41500to41510-cleanup.sql index 09390303761..9866ed089aa 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41500to41510-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41500to41510-cleanup.sql @@ -18,4 +18,3 @@ --; -- Schema upgrade cleanup from 4.15.0.0 to 4.15.1.0 --; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41500to41510.sql b/engine/schema/src/main/resources/META-INF/db/schema-41500to41510.sql index 97a4a3e4f1c..8b9e000bc23 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41500to41510.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41500to41510.sql @@ -35,4 +35,3 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis -- Add support for VMware 7.0.1.0 INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '7.0.1.0', 1024, 0, 59, 64, 1, 1); INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '7.0.1.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='7.0'; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41510to41520-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41510to41520-cleanup.sql index e36ac308d59..fad2403b93d 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41510to41520-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41510to41520-cleanup.sql @@ -18,4 +18,3 @@ --; -- Schema upgrade cleanup from 4.15.1.0 to 4.15.2.0 --; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql index 9db01dd374a..9993611d497 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql @@ -17,4 +17,4 @@ --; -- Schema upgrade cleanup from 4.16.0.0 to 4.16.1.0 ---; \ No newline at end of file +--; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700-cleanup.sql index 667168bc831..3310fe4d684 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700-cleanup.sql @@ -17,4 +17,4 @@ --; -- Schema upgrade cleanup from 4.16.1.0 to 4.17.0.0 ---; \ No newline at end of file +--; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql index c259c1414d1..8417ec29640 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql @@ -968,4 +968,4 @@ WHERE not exists( SELECT 1 ;END; CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (2, 'Debian GNU/Linux 11 (64-bit)', 'XenServer', '8.2.1', 'Debian Bullseye 11'); -CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (2, 'Debian GNU/Linux 11 (32-bit)', 'XenServer', '8.2.1', 'Debian Bullseye 11'); \ No newline at end of file +CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (2, 'Debian GNU/Linux 11 (32-bit)', 'XenServer', '8.2.1', 'Debian Bullseye 11'); diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41700to41710-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41700to41710-cleanup.sql index a6bdbfc3808..0426797d9e4 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41700to41710-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41700to41710-cleanup.sql @@ -17,4 +17,4 @@ --; -- Schema upgrade cleanup from 4.17.0.0 to 4.17.1.0 ---; \ No newline at end of file +--; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql b/engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql index 7b8ed8f6848..2ccd4a8e524 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql @@ -128,4 +128,4 @@ CREATE VIEW `cloud`.`domain_router_view` AS and async_job.job_status = 0; -- PR #6080 Change column `value` size from 255 to 4096 characters, matching the API "updateConfiguration" "value" size -ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL; \ No newline at end of file +ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-421to430-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-421to430-cleanup.sql index 4a58e65477d..ce3b75756c9 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-421to430-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-421to430-cleanup.sql @@ -18,4 +18,3 @@ --; -- Schema cleanup from 4.2.0 to 4.3.0; --; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-441to442.sql b/engine/schema/src/main/resources/META-INF/db/schema-441to442.sql index 3b1618cb977..d90c83e8508 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-441to442.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-441to442.sql @@ -18,4 +18,3 @@ --; -- Schema upgrade from 4.4.1 to 4.4.2; --; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-442to450-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-442to450-cleanup.sql index 33ad92170e3..a8ea565025c 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-442to450-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-442to450-cleanup.sql @@ -30,4 +30,4 @@ Where name = 'xen.nics.max'; UPDATE `cloud`.`configuration` SET value = 'XenServer' -Where value = 'Xen'; \ No newline at end of file +Where value = 'Xen'; diff --git a/engine/schema/src/main/resources/META-INF/db/schema-452to460-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-452to460-cleanup.sql index db5ce1197ac..24083f96e33 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-452to460-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-452to460-cleanup.sql @@ -20,4 +20,3 @@ -- DELETE FROM `cloud`.`configuration` where name='router.reboot.when.outofband.migrated'; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-452to460.sql b/engine/schema/src/main/resources/META-INF/db/schema-452to460.sql index 1046a00efd9..bb291fe8bf5 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-452to460.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-452to460.sql @@ -419,5 +419,3 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'KVM', 'default', 'CentOS 7', 246, utc_timestamp(), 0); UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit` = '32' WHERE `hypervisor_capabilities`.`hypervisor_type` = 'KVM'; - - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-461to470.sql b/engine/schema/src/main/resources/META-INF/db/schema-461to470.sql index 7c701992c4d..238acb5ca41 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-461to470.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-461to470.sql @@ -250,4 +250,3 @@ CREATE VIEW `cloud`.`domain_router_view` AS INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` values (25,UUID(),'VMware','6.0',128,0,13,32,1,1); INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'VMware', '5.5', 'rhel7_64Guest', 245, utc_timestamp(), 0); INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '6.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='5.5' AND (guest_os_id NOT IN (1,2,3,4,62,63,64,65,156,157,221,222) AND guest_os_id NOT BETWEEN 121 AND 130); - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-480to481.sql b/engine/schema/src/main/resources/META-INF/db/schema-480to481.sql index 4c8637bbd6a..3b2d40b3d82 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-480to481.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-480to481.sql @@ -18,4 +18,3 @@ --; -- Schema upgrade from 4.8.0 to 4.8.1; --; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql index 0b426dc680f..1868a090800 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql @@ -268,4 +268,3 @@ CREATE VIEW `cloud`.`user_view` AS `cloud`.`async_job` ON async_job.instance_id = user.id and async_job.instance_type = 'User' and async_job.job_status = 0; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-490to4910-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-490to4910-cleanup.sql index 657713b64f1..b0c4daf439c 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-490to4910-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-490to4910-cleanup.sql @@ -18,4 +18,3 @@ --; -- Schema cleanup from 4.9.0 to 4.9.1.0; --; - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-4910to4920-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-4910to4920-cleanup.sql index 963fda41723..d4ffed544d2 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-4910to4920-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-4910to4920-cleanup.sql @@ -18,4 +18,3 @@ --; -- Schema cleanup from 4.9.1.0 to 4.9.2.0; --; - diff --git a/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml index 75545a89ed1..1d1c831a7b0 100644 --- a/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml +++ b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/module.properties b/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/module.properties index 6c96e91a22d..7beaf8382c3 100644 --- a/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/module.properties +++ b/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=storage-allocator -parent=storage \ No newline at end of file +parent=storage diff --git a/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml b/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml index 860929cdeb5..a0cb6a78e91 100644 --- a/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml +++ b/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml @@ -46,4 +46,4 @@ - \ No newline at end of file + diff --git a/engine/storage/volume/src/test/resource/testContext.xml b/engine/storage/volume/src/test/resource/testContext.xml index da2f5a25779..7352b1148f7 100644 --- a/engine/storage/volume/src/test/resource/testContext.xml +++ b/engine/storage/volume/src/test/resource/testContext.xml @@ -76,4 +76,4 @@ - \ No newline at end of file + diff --git a/engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml b/engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml index 3e067044e53..0d4c6474be1 100644 --- a/engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml +++ b/engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/framework/db/src/test/resources/db.properties b/framework/db/src/test/resources/db.properties index e3a5d228a17..bb7c3984360 100644 --- a/framework/db/src/test/resources/db.properties +++ b/framework/db/src/test/resources/db.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -# Just here to make the unit test not blow up \ No newline at end of file +# Just here to make the unit test not blow up diff --git a/framework/direct-download/pom.xml b/framework/direct-download/pom.xml index e4eb631ec84..4a2dfb44c64 100644 --- a/framework/direct-download/pom.xml +++ b/framework/direct-download/pom.xml @@ -35,4 +35,4 @@ 4.19.0.0-SNAPSHOT ../pom.xml - \ No newline at end of file + diff --git a/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml b/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml index 15b6f802627..926a84a33ad 100644 --- a/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml +++ b/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/framework/jobs/src/test/resources/log4j.properties b/framework/jobs/src/test/resources/log4j.properties index fdf675acbd5..7ffdca8aea5 100644 --- a/framework/jobs/src/test/resources/log4j.properties +++ b/framework/jobs/src/test/resources/log4j.properties @@ -32,4 +32,3 @@ log4j.category.org.apache=DEBUG, rolling, stdout #log4j.category.com.cloud.utils.db.Transaction=ALL log4j.category.org.apache.cloudstack.network.contrail=ALL log4j.category.com.cloud.network=ALL - diff --git a/framework/spring/module/src/test/resources/testfiles/all/test2-defaults.properties b/framework/spring/module/src/test/resources/testfiles/all/test2-defaults.properties index 245692337bc..13a83393a91 100644 --- a/framework/spring/module/src/test/resources/testfiles/all/test2-defaults.properties +++ b/framework/spring/module/src/test/resources/testfiles/all/test2-defaults.properties @@ -14,4 +14,3 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. - diff --git a/framework/spring/module/src/test/resources/testfiles/missingname/module.properties b/framework/spring/module/src/test/resources/testfiles/missingname/module.properties index 245692337bc..13a83393a91 100644 --- a/framework/spring/module/src/test/resources/testfiles/missingname/module.properties +++ b/framework/spring/module/src/test/resources/testfiles/missingname/module.properties @@ -14,4 +14,3 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. - diff --git a/framework/spring/module/src/test/resources/testhierarchy/excluded/module.properties b/framework/spring/module/src/test/resources/testhierarchy/excluded/module.properties index 0ea382afe05..3088f2444dc 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/excluded/module.properties +++ b/framework/spring/module/src/test/resources/testhierarchy/excluded/module.properties @@ -16,4 +16,4 @@ # under the License. name=excluded -parent=base \ No newline at end of file +parent=base diff --git a/framework/spring/module/src/test/resources/testhierarchy/excluded2/module.properties b/framework/spring/module/src/test/resources/testhierarchy/excluded2/module.properties index e3665ee28e6..9c1c16f6a1f 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/excluded2/module.properties +++ b/framework/spring/module/src/test/resources/testhierarchy/excluded2/module.properties @@ -16,4 +16,4 @@ # under the License. name=excluded2 -parent=base \ No newline at end of file +parent=base diff --git a/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/defaults.properties b/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/defaults.properties index 811d44213a4..bf96fe619a2 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/defaults.properties +++ b/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/defaults.properties @@ -17,4 +17,4 @@ modules.include.excluded=false modules.include.base=True -modules.exclude=excluded2,excluded2 \ No newline at end of file +modules.exclude=excluded2,excluded2 diff --git a/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/module.properties b/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/module.properties index 93b91869389..f676150c878 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/module.properties +++ b/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/module.properties @@ -16,4 +16,4 @@ # under the License. name=orphan-of-excluded -parent=excluded \ No newline at end of file +parent=excluded diff --git a/packaging/centos7/cloud-ipallocator.rc b/packaging/centos7/cloud-ipallocator.rc index d3eadec8a82..255725b94d0 100755 --- a/packaging/centos7/cloud-ipallocator.rc +++ b/packaging/centos7/cloud-ipallocator.rc @@ -93,4 +93,3 @@ case "$1" in esac exit $RETVAL - diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index c6ae6a63ae5..9a1cf92ce89 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -714,4 +714,3 @@ pip3 install --upgrade urllib3 * Fri Oct 5 2012 Hugo Trippaers 4.1.0 - new style spec file - diff --git a/packaging/centos8/cloud-ipallocator.rc b/packaging/centos8/cloud-ipallocator.rc index d3eadec8a82..255725b94d0 100755 --- a/packaging/centos8/cloud-ipallocator.rc +++ b/packaging/centos8/cloud-ipallocator.rc @@ -93,4 +93,3 @@ case "$1" in esac exit $RETVAL - diff --git a/plugins/acl/project-role-based/src/main/resources/META-INF/cloudstack/acl-project-role-based/module.properties b/plugins/acl/project-role-based/src/main/resources/META-INF/cloudstack/acl-project-role-based/module.properties index 76064d4ccf6..3aa38c8a088 100644 --- a/plugins/acl/project-role-based/src/main/resources/META-INF/cloudstack/acl-project-role-based/module.properties +++ b/plugins/acl/project-role-based/src/main/resources/META-INF/cloudstack/acl-project-role-based/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=acl-project-role-based -parent=api \ No newline at end of file +parent=api diff --git a/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/module.properties b/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/module.properties index 06fc721bc09..93ef1fa15f8 100644 --- a/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/module.properties +++ b/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=acl-static-role-based -parent=api \ No newline at end of file +parent=api diff --git a/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/module.properties b/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/module.properties index e204fe7ce43..7c1a555e86e 100644 --- a/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/module.properties +++ b/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=explicit-dedication -parent=planner \ No newline at end of file +parent=planner diff --git a/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/module.properties b/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/module.properties index fe0d91b7c12..d915002e0d2 100644 --- a/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/module.properties +++ b/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=host-affinity -parent=planner \ No newline at end of file +parent=planner diff --git a/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml b/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml index 3d42e80b277..483da79d6c8 100644 --- a/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml +++ b/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/module.properties b/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/module.properties index 1ea1e8417fe..359359d8170 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/module.properties +++ b/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=host-anti-affinity -parent=planner \ No newline at end of file +parent=planner diff --git a/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/module.properties b/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/module.properties index c998a87d937..86aa179de82 100644 --- a/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/module.properties +++ b/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=rate-limit -parent=api \ No newline at end of file +parent=api diff --git a/plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/module.properties b/plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/module.properties index a6460b93920..3b3f2a81677 100644 --- a/plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/module.properties +++ b/plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=solidfire-intg-test -parent=api \ No newline at end of file +parent=api diff --git a/plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/module.properties b/plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/module.properties index 826e644b2a1..c000d5697d1 100644 --- a/plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/module.properties +++ b/plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=vmware-sioc -parent=api \ No newline at end of file +parent=api diff --git a/plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/module.properties b/plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/module.properties index 816ba258553..72abf02f348 100644 --- a/plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/module.properties +++ b/plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=networker -parent=backup \ No newline at end of file +parent=backup diff --git a/plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml b/plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml index 271fcc791a6..bfe265e6160 100644 --- a/plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml +++ b/plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml @@ -24,4 +24,3 @@ - diff --git a/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/module.properties b/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/module.properties index 6cda90463a3..85ba7d55a71 100644 --- a/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/module.properties +++ b/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=implicit-dedication -parent=planner \ No newline at end of file +parent=planner diff --git a/plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/module.properties b/plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/module.properties index 7a430b28228..1ac3e142fa0 100644 --- a/plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/module.properties +++ b/plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=user-concentrated-pod -parent=planner \ No newline at end of file +parent=planner diff --git a/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml b/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml index 21a5064908b..3cb5a55bb15 100644 --- a/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml +++ b/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml @@ -23,4 +23,3 @@ - diff --git a/plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/module.properties b/plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/module.properties index 9a04174ec7f..dcfe8d3537f 100644 --- a/plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/module.properties +++ b/plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=host-allocator-random -parent=allocator \ No newline at end of file +parent=allocator diff --git a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/module.properties index 654b0d8b5cb..9fb9f437243 100644 --- a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/module.properties +++ b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=baremetal-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/module.properties index 3307c8cfbd3..93c622e234e 100644 --- a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/module.properties +++ b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=baremetal-discoverer -parent=discoverer \ No newline at end of file +parent=discoverer diff --git a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/module.properties index acfe59415de..993c4641e7e 100644 --- a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/module.properties +++ b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=baremetal-network -parent=network \ No newline at end of file +parent=network diff --git a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/module.properties index c6c4e744b75..2c1ec6b0042 100644 --- a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/module.properties +++ b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=baremetal-planner -parent=planner \ No newline at end of file +parent=planner diff --git a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/module.properties b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/module.properties index b4269a853e0..5583b2bb7fe 100644 --- a/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/module.properties +++ b/plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=baremetal-storage -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/.gitignore b/plugins/hypervisors/hyperv/DotNet/ServerResource/.gitignore index a2f30c86ba7..ca0119f471c 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/.gitignore +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/.gitignore @@ -23,4 +23,3 @@ AgentShell/bin/* ServerResource*/bin/* *.user !.nuget/ - diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentShell.csproj b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentShell.csproj index f804ef6f670..262d2a83a1d 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentShell.csproj +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentShell.csproj @@ -148,4 +148,4 @@ --> - \ No newline at end of file + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config index 3ec08bd29c9..f7acb954cc1 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config @@ -143,4 +143,4 @@ - \ No newline at end of file + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/packages.config b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/packages.config index fb1c846ad3c..2f2cd01f1da 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/packages.config +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/packages.config @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj index 8bebfffbeef..c596b8da564 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj @@ -110,4 +110,4 @@ --> - \ No newline at end of file + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/heartbeat.bat b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/heartbeat.bat index 85f6e7b8fbe..472f68fe6e1 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/heartbeat.bat +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/heartbeat.bat @@ -20,4 +20,4 @@ @REM http://stackoverflow.com/questions/9871499/how-to-get-utc-time-with-windows-batch-file for /f %%x in ('wmic path win32_utctime get /format:list ^| findstr "="') do set %%x -echo %Year%-%Month%-%Day%@%Hour%:%Minute%:%Second%>%1 \ No newline at end of file +echo %Year%-%Month%-%Day%@%Hour%:%Minute%:%Second%>%1 diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/packages.config b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/packages.config index 4c538e4872b..efa54b2d679 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/packages.config +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/packages.config @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/App.config b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/App.config index c959ccf1443..6b941dcfc80 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/App.config +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/App.config @@ -136,4 +136,4 @@ - \ No newline at end of file + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/packages.config b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/packages.config index 4c538e4872b..efa54b2d679 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/packages.config +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/packages.config @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj index 5404736ae6d..3232f672d6a 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj @@ -194,4 +194,4 @@ --> - \ No newline at end of file + diff --git a/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/module.properties b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/module.properties index 439b7d503a3..abf87890ba7 100644 --- a/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/module.properties +++ b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=hyperv-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/module.properties b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/module.properties index be51dd6f1d6..ea8c023329f 100644 --- a/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/module.properties +++ b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=hyperv-discoverer -parent=discoverer \ No newline at end of file +parent=discoverer diff --git a/plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/module.properties b/plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/module.properties index 11379727073..0b28201b1d6 100644 --- a/plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/module.properties +++ b/plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=kvm-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/module.properties b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/module.properties index 1d93fa1efe7..165a1c78799 100644 --- a/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/module.properties +++ b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=ovm-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/module.properties b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/module.properties index 3a4b1f8740f..9f432a51c39 100644 --- a/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/module.properties +++ b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=ovm-discoverer -parent=discoverer \ No newline at end of file +parent=discoverer diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh index 4ed8aa9d1bf..2cc3a0c9f26 100755 --- a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh +++ b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/configureOvm.sh @@ -128,4 +128,3 @@ case "$1" in *) errExit "Valid commands: preSetup postSetup" esac - diff --git a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-compute/module.properties b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-compute/module.properties index 7b12a088161..6bb4e8086b2 100644 --- a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-compute/module.properties +++ b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=simulator-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/module.properties b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/module.properties index 536cf1562fd..59ecba6c3dc 100644 --- a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/module.properties +++ b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=simulator-discoverer -parent=discoverer \ No newline at end of file +parent=discoverer diff --git a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-storage/module.properties b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-storage/module.properties index 97a1784c82a..7a9bcd42625 100644 --- a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-storage/module.properties +++ b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-storage/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=simulator-storage -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml index a2d8314bfb8..79ed50b9b18 100644 --- a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml +++ b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/module.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/module.properties index b605835b94f..bb8972b56a3 100644 --- a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/module.properties +++ b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=vmware-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-discoverer/module.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-discoverer/module.properties index 0d726f85b48..cc9e0a5cf68 100644 --- a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-discoverer/module.properties +++ b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-discoverer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=vmware-discoverer -parent=discoverer \ No newline at end of file +parent=discoverer diff --git a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/module.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/module.properties index 91ea24cc557..0a4f387d767 100644 --- a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/module.properties +++ b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=vmware-network -parent=network \ No newline at end of file +parent=network diff --git a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml index cdfe0098310..e8eec03fca3 100644 --- a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml +++ b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-network/spring-vmware-network-context.xml @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-storage/module.properties b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-storage/module.properties index 9c3bab68940..9ac41839b6a 100644 --- a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-storage/module.properties +++ b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-storage/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=vmware-storage -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-compute/module.properties b/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-compute/module.properties index c6c91f658fc..875ae36d3aa 100644 --- a/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-compute/module.properties +++ b/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=xenserver-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-discoverer/module.properties b/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-discoverer/module.properties index 10d0ecdf729..f24912b6319 100644 --- a/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-discoverer/module.properties +++ b/plugins/hypervisors/xenserver/src/main/resources/META-INF/cloudstack/xenserver-discoverer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=xenserver-discoverer -parent=discoverer \ No newline at end of file +parent=discoverer diff --git a/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/module.properties b/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/module.properties index db2c80da69f..b010fba2ab9 100644 --- a/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/module.properties +++ b/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=vcs -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/cisco-vnmc/src/main/resources/META-INF/cloudstack/cisco-vnmc/module.properties b/plugins/network-elements/cisco-vnmc/src/main/resources/META-INF/cloudstack/cisco-vnmc/module.properties index 69ffb6fe1d0..abaf5755737 100644 --- a/plugins/network-elements/cisco-vnmc/src/main/resources/META-INF/cloudstack/cisco-vnmc/module.properties +++ b/plugins/network-elements/cisco-vnmc/src/main/resources/META-INF/cloudstack/cisco-vnmc/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=cisco-vnmc -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy.xml index c6f7d371e4b..fc9e805486b 100755 --- a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy.xml +++ b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-acl-policy.xml @@ -32,4 +32,4 @@ under the License. \ No newline at end of file +--> diff --git a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-ip-pool.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-ip-pool.xml index 876fa21b1d9..0698c9973a2 100755 --- a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-ip-pool.xml +++ b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-ip-pool.xml @@ -55,4 +55,4 @@ under the License. ippooldn="org-root/org-vlan-123/org-VDC-vlan-123/objgrp-ccc" ippoolname="ccc" ipvalue="10.1.1.20" ---> \ No newline at end of file +--> diff --git a/plugins/network-elements/elastic-loadbalancer/src/main/resources/META-INF/cloudstack/elb/module.properties b/plugins/network-elements/elastic-loadbalancer/src/main/resources/META-INF/cloudstack/elb/module.properties index a8e3b9c8669..559245ddfd3 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/main/resources/META-INF/cloudstack/elb/module.properties +++ b/plugins/network-elements/elastic-loadbalancer/src/main/resources/META-INF/cloudstack/elb/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=elb -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/globodns/src/main/resources/META-INF/cloudstack/globodns/module.properties b/plugins/network-elements/globodns/src/main/resources/META-INF/cloudstack/globodns/module.properties index 6c74bd2315e..cd6bc776451 100644 --- a/plugins/network-elements/globodns/src/main/resources/META-INF/cloudstack/globodns/module.properties +++ b/plugins/network-elements/globodns/src/main/resources/META-INF/cloudstack/globodns/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=globodns -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/contrail/module.properties b/plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/contrail/module.properties index ced0f3addc7..0c3091dc930 100644 --- a/plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/contrail/module.properties +++ b/plugins/network-elements/juniper-contrail/src/main/resources/META-INF/cloudstack/contrail/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=contrail -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/juniper-contrail/src/test/resources/log4j.properties b/plugins/network-elements/juniper-contrail/src/test/resources/log4j.properties index 8c012b184e4..27276fc5012 100644 --- a/plugins/network-elements/juniper-contrail/src/test/resources/log4j.properties +++ b/plugins/network-elements/juniper-contrail/src/test/resources/log4j.properties @@ -32,4 +32,3 @@ log4j.category.org.apache=INFO, rolling, stdout #log4j.category.com.cloud.utils.db.Transaction=ALL log4j.category.org.apache.cloudstack.network.contrail=ALL log4j.category.com.cloud.network=ALL - diff --git a/plugins/network-elements/juniper-contrail/src/test/resources/mysql_db_stop.sh b/plugins/network-elements/juniper-contrail/src/test/resources/mysql_db_stop.sh index 62d70d3956e..7ac304fe6e5 100644 --- a/plugins/network-elements/juniper-contrail/src/test/resources/mysql_db_stop.sh +++ b/plugins/network-elements/juniper-contrail/src/test/resources/mysql_db_stop.sh @@ -27,5 +27,3 @@ mysqladmin -S /tmp/mysql$1/mysqld.sock shutdown -u root rm -rf /tmp/mysql$1 echo "Deleting db directories" - - diff --git a/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml b/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml index 704466fcd1b..fc7e10b5d5c 100644 --- a/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml +++ b/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml b/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml index d1c5f40629f..b2c28d2b29b 100644 --- a/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml +++ b/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/plugins/network-elements/netscaler/src/main/resources/META-INF/cloudstack/netscaler/module.properties b/plugins/network-elements/netscaler/src/main/resources/META-INF/cloudstack/netscaler/module.properties index 2f1b641ae1d..8bf4e6ae0e3 100644 --- a/plugins/network-elements/netscaler/src/main/resources/META-INF/cloudstack/netscaler/module.properties +++ b/plugins/network-elements/netscaler/src/main/resources/META-INF/cloudstack/netscaler/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=netscaler -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/nicira-nvp/src/main/resources/META-INF/cloudstack/nvp/module.properties b/plugins/network-elements/nicira-nvp/src/main/resources/META-INF/cloudstack/nvp/module.properties index 5085fcec0c7..11bc471e92c 100644 --- a/plugins/network-elements/nicira-nvp/src/main/resources/META-INF/cloudstack/nvp/module.properties +++ b/plugins/network-elements/nicira-nvp/src/main/resources/META-INF/cloudstack/nvp/module.properties @@ -18,4 +18,4 @@ # name=nvp -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/opendaylight/src/main/resources/META-INF/cloudstack/opendaylight/spring-opendaylight-context.xml b/plugins/network-elements/opendaylight/src/main/resources/META-INF/cloudstack/opendaylight/spring-opendaylight-context.xml index 244ded82d68..4e9c705be8d 100644 --- a/plugins/network-elements/opendaylight/src/main/resources/META-INF/cloudstack/opendaylight/spring-opendaylight-context.xml +++ b/plugins/network-elements/opendaylight/src/main/resources/META-INF/cloudstack/opendaylight/spring-opendaylight-context.xml @@ -39,4 +39,3 @@ - diff --git a/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/module.properties b/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/module.properties index 960fdba8352..28ef55288a6 100644 --- a/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/module.properties +++ b/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=paloalto -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml b/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml index d812ec044f9..137d8c929e4 100644 --- a/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml +++ b/plugins/network-elements/palo-alto/src/main/resources/META-INF/cloudstack/paloalto/spring-paloalto-context.xml @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/plugins/network-elements/stratosphere-ssp/src/main/resources/META-INF/cloudstack/ssp/module.properties b/plugins/network-elements/stratosphere-ssp/src/main/resources/META-INF/cloudstack/ssp/module.properties index 5a99e561b04..b4d6e1d4db7 100644 --- a/plugins/network-elements/stratosphere-ssp/src/main/resources/META-INF/cloudstack/ssp/module.properties +++ b/plugins/network-elements/stratosphere-ssp/src/main/resources/META-INF/cloudstack/ssp/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=ssp -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/tungsten/pom.xml b/plugins/network-elements/tungsten/pom.xml index a83199347cb..72a292366d8 100644 --- a/plugins/network-elements/tungsten/pom.xml +++ b/plugins/network-elements/tungsten/pom.xml @@ -44,4 +44,4 @@ 2.0 - \ No newline at end of file + diff --git a/plugins/network-elements/tungsten/src/main/resources/META-INF/cloudstack/tungsten/module.properties b/plugins/network-elements/tungsten/src/main/resources/META-INF/cloudstack/tungsten/module.properties index 72422a42b8c..1e24c76d059 100644 --- a/plugins/network-elements/tungsten/src/main/resources/META-INF/cloudstack/tungsten/module.properties +++ b/plugins/network-elements/tungsten/src/main/resources/META-INF/cloudstack/tungsten/module.properties @@ -18,4 +18,4 @@ # name=tungsten -parent=network \ No newline at end of file +parent=network diff --git a/plugins/network-elements/tungsten/src/test/resources/log4j.properties b/plugins/network-elements/tungsten/src/test/resources/log4j.properties index 8c012b184e4..27276fc5012 100644 --- a/plugins/network-elements/tungsten/src/test/resources/log4j.properties +++ b/plugins/network-elements/tungsten/src/test/resources/log4j.properties @@ -32,4 +32,3 @@ log4j.category.org.apache=INFO, rolling, stdout #log4j.category.com.cloud.utils.db.Transaction=ALL log4j.category.org.apache.cloudstack.network.contrail=ALL log4j.category.com.cloud.network=ALL - diff --git a/plugins/network-elements/vxlan/src/main/resources/META-INF/cloudstack/vxlan/module.properties b/plugins/network-elements/vxlan/src/main/resources/META-INF/cloudstack/vxlan/module.properties index 4c2c7f7f7ce..04457d8d6a2 100644 --- a/plugins/network-elements/vxlan/src/main/resources/META-INF/cloudstack/vxlan/module.properties +++ b/plugins/network-elements/vxlan/src/main/resources/META-INF/cloudstack/vxlan/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=vxlan -parent=network \ No newline at end of file +parent=network diff --git a/plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/module.properties b/plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/module.properties index 8381f6eff18..4bdbee27a2b 100644 --- a/plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/module.properties +++ b/plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=storage-image-default -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/module.properties b/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/module.properties index da571e2dda9..6efe32cd69e 100644 --- a/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/module.properties +++ b/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=storage-image-s3 -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/module.properties b/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/module.properties index 1fa4be6f5e5..9cd56e7fa49 100644 --- a/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/module.properties +++ b/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=storage-image-swift -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/storage/volume/cloudbyte/src/main/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties b/plugins/storage/volume/cloudbyte/src/main/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties index 92cd58fc33d..c494608871b 100755 --- a/plugins/storage/volume/cloudbyte/src/main/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties +++ b/plugins/storage/volume/cloudbyte/src/main/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties @@ -18,4 +18,4 @@ # name=storage-volume-cloudbyte -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/module.properties b/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/module.properties index 61369884987..e5964154837 100644 --- a/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/module.properties +++ b/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=storage-volume-default -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties b/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties index c2036006f1f..fe95f289dcd 100644 --- a/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties +++ b/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=storage-volume-nexenta -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml b/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml index 52032e11ac8..c1dae747505 100644 --- a/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml +++ b/plugins/storage/volume/nexenta/src/main/resources/META-INF.cloudstack.storage-volume-solidfire/spring-storage-volume-nexenta-context.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/plugins/storage/volume/solidfire/src/main/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties b/plugins/storage/volume/solidfire/src/main/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties index 335a9d2b45e..72b2e03f898 100644 --- a/plugins/storage/volume/solidfire/src/main/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties +++ b/plugins/storage/volume/solidfire/src/main/resources/META-INF/cloudstack/storage-volume-solidfire/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=storage-volume-solidfire -parent=storage \ No newline at end of file +parent=storage diff --git a/plugins/user-authenticators/ldap/src/main/resources/META-INF/cloudstack/ldap/module.properties b/plugins/user-authenticators/ldap/src/main/resources/META-INF/cloudstack/ldap/module.properties index 4659ab51fd6..7194ac4aee3 100644 --- a/plugins/user-authenticators/ldap/src/main/resources/META-INF/cloudstack/ldap/module.properties +++ b/plugins/user-authenticators/ldap/src/main/resources/META-INF/cloudstack/ldap/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=ldap -parent=api \ No newline at end of file +parent=api diff --git a/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy index 36b37cad9d0..769f62339be 100644 --- a/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy +++ b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapUserSpec.groovy @@ -107,4 +107,4 @@ class LdapUserSpec extends spock.lang.Specification { where: "The username is set to " domain << ["", null, "engineering"] } -} \ No newline at end of file +} diff --git a/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy index 4c0cc4b688f..93c91e37f8a 100644 --- a/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy +++ b/plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/NoLdapUserMatchingQueryExceptionSpec.groovy @@ -27,4 +27,4 @@ class NoLdapUserMatchingQueryExceptionSpec extends spock.lang.Specification { where: "The username is set to " query << ["", null, "murp*"] } -} \ No newline at end of file +} diff --git a/plugins/user-authenticators/ldap/src/test/resources/cloudstack.org.ldif b/plugins/user-authenticators/ldap/src/test/resources/cloudstack.org.ldif index 407837256c9..ad677bc89da 100644 --- a/plugins/user-authenticators/ldap/src/test/resources/cloudstack.org.ldif +++ b/plugins/user-authenticators/ldap/src/test/resources/cloudstack.org.ldif @@ -308,4 +308,3 @@ givenName: Cammy mail: cpetri@cloudstack.org uid: cpetri userpassword:: cGFzc3dvcmQ= - diff --git a/plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif b/plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif index a6c1da15411..e2e7f9927c0 100644 --- a/plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif +++ b/plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif @@ -148,4 +148,4 @@ cn: demo sn: User givenName: demo mail: d@b.c -uid: noadmin \ No newline at end of file +uid: noadmin diff --git a/plugins/user-authenticators/ldap/src/test/resources/minimal.ldif b/plugins/user-authenticators/ldap/src/test/resources/minimal.ldif index 46e87c29ab8..035c2168183 100644 --- a/plugins/user-authenticators/ldap/src/test/resources/minimal.ldif +++ b/plugins/user-authenticators/ldap/src/test/resources/minimal.ldif @@ -240,4 +240,3 @@ givenName: demo inetUserStatus: Active mail: d@b.c uid: noadmin - diff --git a/plugins/user-authenticators/ldap/src/test/resources/unboundid.ldif b/plugins/user-authenticators/ldap/src/test/resources/unboundid.ldif index 407837256c9..ad677bc89da 100644 --- a/plugins/user-authenticators/ldap/src/test/resources/unboundid.ldif +++ b/plugins/user-authenticators/ldap/src/test/resources/unboundid.ldif @@ -308,4 +308,3 @@ givenName: Cammy mail: cpetri@cloudstack.org uid: cpetri userpassword:: cGFzc3dvcmQ= - diff --git a/plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/module.properties b/plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/module.properties index 03ba7397117..c79f1b6ebb3 100644 --- a/plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/module.properties +++ b/plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=md5 -parent=api \ No newline at end of file +parent=api diff --git a/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/module.properties b/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/module.properties index 5a295638f0f..1ff77da2a36 100644 --- a/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/module.properties +++ b/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=plaintext -parent=api \ No newline at end of file +parent=api diff --git a/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/module.properties b/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/module.properties index c70a2f516ec..ae81f5a84db 100644 --- a/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/module.properties +++ b/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=sha256salted -parent=api \ No newline at end of file +parent=api diff --git a/plugins/user-two-factor-authenticators/static-pin/pom.xml b/plugins/user-two-factor-authenticators/static-pin/pom.xml index 60cf3d26df8..2a731aaf968 100644 --- a/plugins/user-two-factor-authenticators/static-pin/pom.xml +++ b/plugins/user-two-factor-authenticators/static-pin/pom.xml @@ -27,4 +27,4 @@ 4.19.0.0-SNAPSHOT ../../pom.xml - \ No newline at end of file + diff --git a/plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/module.properties b/plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/module.properties index 14deddd5bfc..2c92233558d 100644 --- a/plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/module.properties +++ b/plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=staticpin -parent=api \ No newline at end of file +parent=api diff --git a/plugins/user-two-factor-authenticators/totp/pom.xml b/plugins/user-two-factor-authenticators/totp/pom.xml index b9455ee4648..1aaae7f7f01 100644 --- a/plugins/user-two-factor-authenticators/totp/pom.xml +++ b/plugins/user-two-factor-authenticators/totp/pom.xml @@ -27,4 +27,4 @@ 4.19.0.0-SNAPSHOT ../../pom.xml - \ No newline at end of file + diff --git a/plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/module.properties b/plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/module.properties index 1b735ac1242..9b37b6924ed 100644 --- a/plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/module.properties +++ b/plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=totp -parent=api \ No newline at end of file +parent=api diff --git a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in index 3921484e54c..4944fc0218e 100755 --- a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in +++ b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in @@ -93,4 +93,3 @@ case "$1" in esac exit $RETVAL - diff --git a/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in index 23ec8f3cd66..28d5a115914 100755 --- a/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in +++ b/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in @@ -93,4 +93,3 @@ case "$1" in esac exit $RETVAL - diff --git a/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in index 51b4f58e179..de68534f2e4 100755 --- a/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in +++ b/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in @@ -113,4 +113,3 @@ case "$1" in esac exit $RETVAL - diff --git a/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in index 23ec8f3cd66..28d5a115914 100644 --- a/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in +++ b/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in @@ -93,4 +93,3 @@ case "$1" in esac exit $RETVAL - diff --git a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in index 51b4f58e179..de68534f2e4 100755 --- a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in +++ b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in @@ -113,4 +113,3 @@ case "$1" in esac exit $RETVAL - diff --git a/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in index e2cb36197a6..4acb11a1f4f 100755 --- a/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in +++ b/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in @@ -107,4 +107,3 @@ case "$1" in esac exit $RETVAL - diff --git a/scripts/installer/export-templates.sh b/scripts/installer/export-templates.sh index 9371f1c7412..dbd560e44c7 100644 --- a/scripts/installer/export-templates.sh +++ b/scripts/installer/export-templates.sh @@ -189,4 +189,3 @@ elif [ $1 == "xenserver" ]; then else echo "Conversion of template to $1's compatible format not supported " fi - diff --git a/scripts/network/juniper/dest-nat-rule-getone.xml b/scripts/network/juniper/dest-nat-rule-getone.xml index 992dc0edf78..9dd2a1b2169 100644 --- a/scripts/network/juniper/dest-nat-rule-getone.xml +++ b/scripts/network/juniper/dest-nat-rule-getone.xml @@ -34,5 +34,3 @@ under the License. - - diff --git a/scripts/network/juniper/firewall-filter-bytes-getall.xml b/scripts/network/juniper/firewall-filter-bytes-getall.xml index 9384daf48d5..c5a3728939c 100644 --- a/scripts/network/juniper/firewall-filter-bytes-getall.xml +++ b/scripts/network/juniper/firewall-filter-bytes-getall.xml @@ -20,4 +20,3 @@ under the License. - diff --git a/scripts/network/juniper/src-nat-rule-add.xml b/scripts/network/juniper/src-nat-rule-add.xml index 4093af79870..58faf1c08a6 100644 --- a/scripts/network/juniper/src-nat-rule-add.xml +++ b/scripts/network/juniper/src-nat-rule-add.xml @@ -44,5 +44,3 @@ under the License. - - diff --git a/scripts/network/juniper/src-nat-rule-getall.xml b/scripts/network/juniper/src-nat-rule-getall.xml index e04378bd5af..d42d4b630ea 100644 --- a/scripts/network/juniper/src-nat-rule-getall.xml +++ b/scripts/network/juniper/src-nat-rule-getall.xml @@ -28,4 +28,3 @@ under the License. - diff --git a/scripts/network/juniper/src-nat-rule-getone.xml b/scripts/network/juniper/src-nat-rule-getone.xml index 999969b4196..80bcbbcf9e9 100644 --- a/scripts/network/juniper/src-nat-rule-getone.xml +++ b/scripts/network/juniper/src-nat-rule-getone.xml @@ -34,5 +34,3 @@ under the License. - - diff --git a/scripts/network/juniper/static-nat-rule-add.xml b/scripts/network/juniper/static-nat-rule-add.xml index 8316e631f41..bc8d53cdaa5 100644 --- a/scripts/network/juniper/static-nat-rule-add.xml +++ b/scripts/network/juniper/static-nat-rule-add.xml @@ -45,5 +45,3 @@ under the License. - - diff --git a/scripts/network/juniper/static-nat-rule-getall.xml b/scripts/network/juniper/static-nat-rule-getall.xml index a5d0f0a2892..11755f39fcb 100644 --- a/scripts/network/juniper/static-nat-rule-getall.xml +++ b/scripts/network/juniper/static-nat-rule-getall.xml @@ -28,5 +28,3 @@ under the License. - - diff --git a/scripts/network/juniper/static-nat-rule-getone.xml b/scripts/network/juniper/static-nat-rule-getone.xml index bbec6c3c781..e2b910238c9 100644 --- a/scripts/network/juniper/static-nat-rule-getone.xml +++ b/scripts/network/juniper/static-nat-rule-getone.xml @@ -34,5 +34,3 @@ under the License. - - diff --git a/scripts/network/juniper/test.xml b/scripts/network/juniper/test.xml index 16bbd79a18e..84fe3a48e8b 100644 --- a/scripts/network/juniper/test.xml +++ b/scripts/network/juniper/test.xml @@ -31,4 +31,3 @@ under the License. - diff --git a/scripts/network/juniper/zone-interface-add.xml b/scripts/network/juniper/zone-interface-add.xml index 4b93ba34041..9b2d37278ac 100644 --- a/scripts/network/juniper/zone-interface-add.xml +++ b/scripts/network/juniper/zone-interface-add.xml @@ -32,4 +32,3 @@ under the License. - diff --git a/scripts/network/juniper/zone-interface-getone.xml b/scripts/network/juniper/zone-interface-getone.xml index b0ead3cd850..4bc5c4bc0d2 100644 --- a/scripts/network/juniper/zone-interface-getone.xml +++ b/scripts/network/juniper/zone-interface-getone.xml @@ -32,4 +32,3 @@ under the License. - diff --git a/scripts/storage/qcow2/managevolume.sh b/scripts/storage/qcow2/managevolume.sh index abf8dd62dbe..1f530470f57 100755 --- a/scripts/storage/qcow2/managevolume.sh +++ b/scripts/storage/qcow2/managevolume.sh @@ -176,5 +176,3 @@ else fi exit 0 - - diff --git a/scripts/storage/secondary/setup-sysvm-tmplt b/scripts/storage/secondary/setup-sysvm-tmplt index 905d0d54cc8..8b656621891 100755 --- a/scripts/storage/secondary/setup-sysvm-tmplt +++ b/scripts/storage/secondary/setup-sysvm-tmplt @@ -171,4 +171,4 @@ then fi echo "Successfully installed system VM template $tmpltimg and template.properties to $destdir" -exit 0 \ No newline at end of file +exit 0 diff --git a/scripts/vm/hypervisor/kvm/nsrkvmbackup.sh b/scripts/vm/hypervisor/kvm/nsrkvmbackup.sh index c6e115fdc60..2fcfa0b6424 100755 --- a/scripts/vm/hypervisor/kvm/nsrkvmbackup.sh +++ b/scripts/vm/hypervisor/kvm/nsrkvmbackup.sh @@ -257,4 +257,4 @@ while getopts "h?vs:l:c:t:u:p:P:R:" opt; do backup_domain "$kvmDName" "$snapPrefix$kvmDName" - exit 0 \ No newline at end of file + exit 0 diff --git a/scripts/vm/hypervisor/kvm/nsrkvmrestore.sh b/scripts/vm/hypervisor/kvm/nsrkvmrestore.sh index ad3865d7f1f..40a9021e850 100755 --- a/scripts/vm/hypervisor/kvm/nsrkvmrestore.sh +++ b/scripts/vm/hypervisor/kvm/nsrkvmrestore.sh @@ -220,4 +220,4 @@ elif [[ -n "$ssid" && -z "$newvolumeUuid" ]]; then sanity_checks restore_all_volumes fi -exit 0 \ No newline at end of file +exit 0 diff --git a/scripts/vm/hypervisor/xenserver/add_to_vcpus_params_live.sh b/scripts/vm/hypervisor/xenserver/add_to_vcpus_params_live.sh index 0fadcd85860..b44fec9aaae 100644 --- a/scripts/vm/hypervisor/xenserver/add_to_vcpus_params_live.sh +++ b/scripts/vm/hypervisor/xenserver/add_to_vcpus_params_live.sh @@ -30,4 +30,3 @@ if [[ $key == "cap" ]] then xe vm-param-set VCPUs-params:cap=$value uuid=$uuid fi - diff --git a/scripts/vm/hypervisor/xenserver/cloud-plugin-storage b/scripts/vm/hypervisor/xenserver/cloud-plugin-storage index bc909474dcb..d28c19543bd 100644 --- a/scripts/vm/hypervisor/xenserver/cloud-plugin-storage +++ b/scripts/vm/hypervisor/xenserver/cloud-plugin-storage @@ -302,4 +302,3 @@ if __name__ == "__main__": "umountNfsSecondaryStorage":umountNfsSecondaryStorage, "makeDirectory":makeDirectory}) - diff --git a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh index 4f80f720ad5..3a1f88b48f5 100755 --- a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh +++ b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh @@ -98,4 +98,3 @@ do echo "Warning : Don't know how to handle VM $vm, it is in $state state" fi done - diff --git a/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh b/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh index 3b806b577ad..699d1d395b4 100755 --- a/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh +++ b/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh @@ -107,4 +107,3 @@ for hostSlave in $hostSlaves; do fi done echo "#check is successful, you can add these hosts to CloudStack." - diff --git a/scripts/vm/hypervisor/xenserver/cloudlog b/scripts/vm/hypervisor/xenserver/cloudlog index ed7e6908ad7..bf0202e3f79 100644 --- a/scripts/vm/hypervisor/xenserver/cloudlog +++ b/scripts/vm/hypervisor/xenserver/cloudlog @@ -34,4 +34,3 @@ size 1M rotate 2 } - diff --git a/scripts/vm/hypervisor/xenserver/make_migratable.sh b/scripts/vm/hypervisor/xenserver/make_migratable.sh index aada316e658..a7ae262c33e 100755 --- a/scripts/vm/hypervisor/xenserver/make_migratable.sh +++ b/scripts/vm/hypervisor/xenserver/make_migratable.sh @@ -78,5 +78,3 @@ case "${power_state}" in exit 3 ;; esac - - diff --git a/scripts/vm/hypervisor/xenserver/network_info.sh b/scripts/vm/hypervisor/xenserver/network_info.sh index 96df382339b..ff4805a9e30 100755 --- a/scripts/vm/hypervisor/xenserver/network_info.sh +++ b/scripts/vm/hypervisor/xenserver/network_info.sh @@ -55,4 +55,3 @@ then fi [ -n "$gflag" ] && echo $gateway && exit 0 - diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel index 72855cde443..f349873ee73 100755 --- a/scripts/vm/hypervisor/xenserver/ovstunnel +++ b/scripts/vm/hypervisor/xenserver/ovstunnel @@ -356,4 +356,4 @@ if __name__ == "__main__": "getLabel": getLabel, "setup_ovs_bridge_for_distributed_routing": setup_ovs_bridge_for_distributed_routing, "configure_ovs_bridge_for_network_topology": configure_ovs_bridge_for_network_topology, - "configure_ovs_bridge_for_routing_policies": configure_ovs_bridge_for_routing_policies}) \ No newline at end of file + "configure_ovs_bridge_for_routing_policies": configure_ovs_bridge_for_routing_policies}) diff --git a/scripts/vm/hypervisor/xenserver/setup_iscsi.sh b/scripts/vm/hypervisor/xenserver/setup_iscsi.sh index 660a92f6fa1..096e161794c 100755 --- a/scripts/vm/hypervisor/xenserver/setup_iscsi.sh +++ b/scripts/vm/hypervisor/xenserver/setup_iscsi.sh @@ -50,4 +50,3 @@ then exit 1 fi printf "=======> DONE <======\n" - diff --git a/scripts/vm/hypervisor/xenserver/setupxenserver.sh b/scripts/vm/hypervisor/xenserver/setupxenserver.sh index 6c850c6665e..ef1f68f1adf 100755 --- a/scripts/vm/hypervisor/xenserver/setupxenserver.sh +++ b/scripts/vm/hypervisor/xenserver/setupxenserver.sh @@ -62,4 +62,3 @@ cat /dev/null > /root/.ssh/known_hosts rm -f /opt/xensource/packages/iso/systemvm-premium.iso echo "success" - diff --git a/scripts/vm/hypervisor/xenserver/upgrade_vnc_config.sh b/scripts/vm/hypervisor/xenserver/upgrade_vnc_config.sh index e65b9ec29dd..c6a146700de 100755 --- a/scripts/vm/hypervisor/xenserver/upgrade_vnc_config.sh +++ b/scripts/vm/hypervisor/xenserver/upgrade_vnc_config.sh @@ -21,4 +21,3 @@ iptables -D RH-Firewall-1-INPUT -p tcp -m tcp --dport 5900:6099 -j ACCEPT 2>&1 # remove listening vnc on all interface sed -i 's/0\.0\.0\.0/127\.0\.0\.1/' /opt/xensource/libexec/vncterm-wrapper 2>&1 sed -i 's/0\.0\.0\.0/127\.0\.0\.1/' /opt/xensource/libexec/qemu-dm-wrapper 2>&1 - diff --git a/scripts/vm/hypervisor/xenserver/vmopsSnapshot b/scripts/vm/hypervisor/xenserver/vmopsSnapshot index b74a8550e05..d4cd4b98210 100755 --- a/scripts/vm/hypervisor/xenserver/vmopsSnapshot +++ b/scripts/vm/hypervisor/xenserver/vmopsSnapshot @@ -621,4 +621,3 @@ def revert_memory_snapshot(session, args): if __name__ == "__main__": XenAPIPlugin.dispatch({"getVhdParent":getVhdParent, "create_secondary_storage_folder":create_secondary_storage_folder, "delete_secondary_storage_folder":delete_secondary_storage_folder, "post_create_private_template":post_create_private_template, "backupSnapshot": backupSnapshot, "deleteSnapshotBackup": deleteSnapshotBackup, "unmountSnapshotsDir": unmountSnapshotsDir, "revert_memory_snapshot":revert_memory_snapshot, "getSnapshotSize":getSnapshotSize}) - diff --git a/scripts/vm/hypervisor/xenserver/xcposs/patch b/scripts/vm/hypervisor/xenserver/xcposs/patch index 1edd35ad628..f516251c169 100644 --- a/scripts/vm/hypervisor/xenserver/xcposs/patch +++ b/scripts/vm/hypervisor/xenserver/xcposs/patch @@ -60,4 +60,4 @@ router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin cloudstack_plugins.conf=..,0644,/etc/xensource cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins cloudlog=..,0644,/etc/logrotate.d -update_host_passwd.sh=../..,0755,/opt/cloud/bin \ No newline at end of file +update_host_passwd.sh=../..,0755,/opt/cloud/bin diff --git a/scripts/vm/hypervisor/xenserver/xcpserver/patch b/scripts/vm/hypervisor/xenserver/xcpserver/patch index 8bb1eadd703..e08fe4d6217 100644 --- a/scripts/vm/hypervisor/xenserver/xcpserver/patch +++ b/scripts/vm/hypervisor/xenserver/xcpserver/patch @@ -61,4 +61,4 @@ add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin cloudstack_plugins.conf=..,0644,/etc/xensource cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins cloudlog=..,0644,/etc/logrotate.d -update_host_passwd.sh=../..,0755,/opt/cloud/bin \ No newline at end of file +update_host_passwd.sh=../..,0755,/opt/cloud/bin diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh index b4ef56eaaf1..355f06f2ab9 100755 --- a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh +++ b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh @@ -109,4 +109,4 @@ do done /usr/bin/logger -t heartbeat "Problem with $hb: not reachable for $(($(date +%s) - $lastdate)) seconds, rebooting system!" -echo b > /proc/sysrq-trigger \ No newline at end of file +echo b > /proc/sysrq-trigger diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/patch b/scripts/vm/hypervisor/xenserver/xenserver60/patch index 2652c30cd05..67475de319d 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver60/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch @@ -71,4 +71,4 @@ ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin ovs-get-bridge.sh=..,0755,/opt/cloud/bin cloudlog=..,0644,/etc/logrotate.d update_host_passwd.sh=../..,0755,/opt/cloud/bin -logrotate=..,0755,/etc/cron.hourly \ No newline at end of file +logrotate=..,0755,/etc/cron.hourly diff --git a/scripts/vm/hypervisor/xenserver/xenserver62/patch b/scripts/vm/hypervisor/xenserver/xenserver62/patch index f18a325f05b..e225105e1f8 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver62/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver62/patch @@ -67,4 +67,4 @@ ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin ovs-get-bridge.sh=..,0755,/opt/cloud/bin cloudlog=..,0644,/etc/logrotate.d update_host_passwd.sh=../..,0755,/opt/cloud/bin -logrotate=..,0755,/etc/cron.hourly \ No newline at end of file +logrotate=..,0755,/etc/cron.hourly diff --git a/scripts/vm/hypervisor/xenserver/xenserver65/patch b/scripts/vm/hypervisor/xenserver/xenserver65/patch index f18a325f05b..e225105e1f8 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver65/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver65/patch @@ -67,4 +67,4 @@ ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin ovs-get-bridge.sh=..,0755,/opt/cloud/bin cloudlog=..,0644,/etc/logrotate.d update_host_passwd.sh=../..,0755,/opt/cloud/bin -logrotate=..,0755,/etc/cron.hourly \ No newline at end of file +logrotate=..,0755,/etc/cron.hourly diff --git a/scripts/vm/hypervisor/xenserver/xs_cleanup.sh b/scripts/vm/hypervisor/xenserver/xs_cleanup.sh index 7ea38369a09..d2efa866fdb 100755 --- a/scripts/vm/hypervisor/xenserver/xs_cleanup.sh +++ b/scripts/vm/hypervisor/xenserver/xs_cleanup.sh @@ -66,4 +66,3 @@ done echo "======> DONE <======" exit 0 - diff --git a/scripts/vm/network/ovs-pvlan-cleanup.sh b/scripts/vm/network/ovs-pvlan-cleanup.sh index 7493bedeff6..b79c2bd1f26 100755 --- a/scripts/vm/network/ovs-pvlan-cleanup.sh +++ b/scripts/vm/network/ovs-pvlan-cleanup.sh @@ -20,4 +20,3 @@ ovs-ofctl del-flows xenbr0 ovs-ofctl add-flow xenbr0 priority=0,actions=NORMAL - diff --git a/scripts/vm/network/ovs-pvlan-vm.sh b/scripts/vm/network/ovs-pvlan-vm.sh index 06e41fe4219..c306faa2cfe 100755 --- a/scripts/vm/network/ovs-pvlan-vm.sh +++ b/scripts/vm/network/ovs-pvlan-vm.sh @@ -97,4 +97,3 @@ else ovs-ofctl del-flows --strict $br priority=50,dl_vlan=0xffff,dl_src=$vm_mac ovs-ofctl del-flows --strict $br priority=60,dl_vlan=$sec_iso_vlan,dl_src=$vm_mac fi - diff --git a/scripts/vm/network/tungsten/setup_tungsten_vrouter.sh b/scripts/vm/network/tungsten/setup_tungsten_vrouter.sh index e041eac4c55..9d19af36bba 100755 --- a/scripts/vm/network/tungsten/setup_tungsten_vrouter.sh +++ b/scripts/vm/network/tungsten/setup_tungsten_vrouter.sh @@ -21,4 +21,4 @@ if [ -z "$vif" ] || [ $1 == 'delete' ] then container=$(docker ps | grep contrail-vrouter-agent | awk '{print $1}') docker exec $container python /opt/contrail/utils/provision_vgw_interface.py --oper $1 --interface $2 --subnets "$3" --routes "$4" --vrf $5 -fi \ No newline at end of file +fi diff --git a/server/conf/cloudstack-catalina.logrotate b/server/conf/cloudstack-catalina.logrotate index 498f690dd07..3fd67c91642 100644 --- a/server/conf/cloudstack-catalina.logrotate +++ b/server/conf/cloudstack-catalina.logrotate @@ -23,4 +23,4 @@ compress missingok create 0644 cloud cloud -} \ No newline at end of file +} diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml index 19007173b1d..244c2d913b9 100644 --- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml @@ -81,4 +81,4 @@ - \ No newline at end of file + diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties index 120c91d3f41..765be372659 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-alert-adapter-backend -parent=backend \ No newline at end of file +parent=backend diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties index 12213f44910..9cd48782976 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-alert-adapter-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties index c156009acbd..2716ac782cf 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-alert-adapter-storage -parent=storage \ No newline at end of file +parent=storage diff --git a/server/src/main/resources/META-INF/cloudstack/server-allocator/module.properties b/server/src/main/resources/META-INF/cloudstack/server-allocator/module.properties index f69c483deb6..f0075d027ff 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-allocator/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-allocator/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-allocator -parent=allocator \ No newline at end of file +parent=allocator diff --git a/server/src/main/resources/META-INF/cloudstack/server-api/module.properties b/server/src/main/resources/META-INF/cloudstack/server-api/module.properties index 74a9c504207..034e81a4d2e 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-api/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-api/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-api -parent=api \ No newline at end of file +parent=api diff --git a/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml b/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml index 30e7647fd12..1f1b24e8a29 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/server/src/main/resources/META-INF/cloudstack/server-compute/module.properties b/server/src/main/resources/META-INF/cloudstack/server-compute/module.properties index 7b42a910871..6766e6d2401 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-compute/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-compute/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-compute -parent=compute \ No newline at end of file +parent=compute diff --git a/server/src/main/resources/META-INF/cloudstack/server-discoverer/module.properties b/server/src/main/resources/META-INF/cloudstack/server-discoverer/module.properties index 0c4f5e1c3e5..9d49120dd2d 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-discoverer/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-discoverer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-discoverer -parent=discoverer \ No newline at end of file +parent=discoverer diff --git a/server/src/main/resources/META-INF/cloudstack/server-fencer/module.properties b/server/src/main/resources/META-INF/cloudstack/server-fencer/module.properties index b4a868498bf..b045d11395c 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-fencer/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-fencer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-fencer -parent=compute \ No newline at end of file +parent=compute diff --git a/server/src/main/resources/META-INF/cloudstack/server-investigator/module.properties b/server/src/main/resources/META-INF/cloudstack/server-investigator/module.properties index 85e68824cf3..dffdb2f9ddd 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-investigator/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-investigator/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-investigator -parent=compute \ No newline at end of file +parent=compute diff --git a/server/src/main/resources/META-INF/cloudstack/server-network/module.properties b/server/src/main/resources/META-INF/cloudstack/server-network/module.properties index 95a7d1bacfb..5d99a316936 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-network/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-network/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-network -parent=network \ No newline at end of file +parent=network diff --git a/server/src/main/resources/META-INF/cloudstack/server-planner/module.properties b/server/src/main/resources/META-INF/cloudstack/server-planner/module.properties index 541b7693be0..023afd771ab 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-planner/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-planner/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-planner -parent=planner \ No newline at end of file +parent=planner diff --git a/server/src/main/resources/META-INF/cloudstack/server-storage/module.properties b/server/src/main/resources/META-INF/cloudstack/server-storage/module.properties index 9eaf2d0a684..5a427b224ca 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-storage/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-storage/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-storage -parent=storage \ No newline at end of file +parent=storage diff --git a/server/src/main/resources/META-INF/cloudstack/server-template-adapter/module.properties b/server/src/main/resources/META-INF/cloudstack/server-template-adapter/module.properties index 85ba3176b80..66721d37763 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-template-adapter/module.properties +++ b/server/src/main/resources/META-INF/cloudstack/server-template-adapter/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=server-template-adapter -parent=storage \ No newline at end of file +parent=storage diff --git a/server/src/main/resources/META-INF/cloudstack/system/spring-server-system-context.xml b/server/src/main/resources/META-INF/cloudstack/system/spring-server-system-context.xml index 9eb0a4c469b..d742c639f71 100644 --- a/server/src/main/resources/META-INF/cloudstack/system/spring-server-system-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/system/spring-server-system-context.xml @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/services/console-proxy/rdpconsole/rdp-config.bat b/services/console-proxy/rdpconsole/rdp-config.bat index f19b00da958..614ee236c8a 100755 --- a/services/console-proxy/rdpconsole/rdp-config.bat +++ b/services/console-proxy/rdpconsole/rdp-config.bat @@ -39,4 +39,3 @@ sc config TermService start=auto rem Start TS service net start Termservice - diff --git a/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat b/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat index 4e19157e5d5..f5afc0c4ae4 100755 --- a/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat +++ b/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat @@ -136,4 +136,3 @@ rem PS. rem Don't forget to set Windows profile as active in Network Monitor, so SSL traffic branch will appear under rem svnchost.exe, so you will be able to decrypt it (don't forget to save and reopen captured traffic to file first). rem - diff --git a/services/secondary-storage/server/src/main/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties b/services/secondary-storage/server/src/main/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties index 7ff8a3ac13f..637b63968ec 100644 --- a/services/secondary-storage/server/src/main/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties +++ b/services/secondary-storage/server/src/main/resources/META-INF/cloudstack/secondary-storage-discoverer/module.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. name=secondary-storage-discoverer -parent=discoverer \ No newline at end of file +parent=discoverer diff --git a/setup/bindir/cloud-sysvmadm.in b/setup/bindir/cloud-sysvmadm.in index e826deaf6ff..a5bb9b37ac1 100755 --- a/setup/bindir/cloud-sysvmadm.in +++ b/setup/bindir/cloud-sysvmadm.in @@ -498,5 +498,3 @@ if [ "$vpc" == "1" ] then restart_vpcs fi - - diff --git a/setup/db/221to222upgrade.sh b/setup/db/221to222upgrade.sh index 8fb1e7563c8..5113c510c45 100644 --- a/setup/db/221to222upgrade.sh +++ b/setup/db/221to222upgrade.sh @@ -46,5 +46,3 @@ then exit 1 fi echo Finished upgrade for database: cloud_usage from 2.2.1 to 2.2.2 - - diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index a241d9a4624..a319dc309ba 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -2475,4 +2475,3 @@ CREATE TABLE `cloud`.`nicira_nvp_nic_map` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; SET foreign_key_checks = 1; - diff --git a/setup/db/index-20to21.sql b/setup/db/index-20to21.sql index d259f793c87..43210e576aa 100644 --- a/setup/db/index-20to21.sql +++ b/setup/db/index-20to21.sql @@ -57,4 +57,3 @@ ALTER TABLE `cloud`.`vm_instance` ADD INDEX `i_vm_instance__last_host_id`(`last_ -- drop foreign key constraits temporarily to allow data update in migration process ALTER TABLE `cloud`.`user_vm` DROP FOREIGN KEY `fk_user_vm__service_offering_id`; - diff --git a/setup/db/index-212to213.sql b/setup/db/index-212to213.sql index d03b29aa114..348c5131cb5 100644 --- a/setup/db/index-212to213.sql +++ b/setup/db/index-212to213.sql @@ -17,4 +17,3 @@ ALTER TABLE `cloud`.`user` DROP KEY `i_user__username__removed`; - diff --git a/setup/db/templates.sql b/setup/db/templates.sql index ba514894b96..aa0bd1d4e9d 100755 --- a/setup/db/templates.sql +++ b/setup/db/templates.sql @@ -596,4 +596,3 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('KVM', 'DOS', 102); INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('KVM', 'Other', 60); INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('KVM', 'Other', 103); - diff --git a/systemvm/agent/certs/realhostip.key b/systemvm/agent/certs/realhostip.key index 53bdc86e273..47031f41244 100644 --- a/systemvm/agent/certs/realhostip.key +++ b/systemvm/agent/certs/realhostip.key @@ -21,4 +21,4 @@ NhNKKl5wzdEUKwW0yBL1WSS5PQgWPwgARYP25/ggW22sj+49WIo1neXsEKPGWObk8e050f1fTt92 Vo1lAoGAb1gCoyBCzvi7sqFxm4V5oapnJeiQQJFjhoYWqGa26rQ+AvXXNuBcigIeDXNJPctSF0Uc p11KbbCgiruBbckvM1vGsk6Sx4leRk+IFHRpJktFUek4o0eUg0shOsyyvyet48Dfg0a8FvcxROs0 gD+IYds5doiob/hcm1hnNB/3vk4= ------END PRIVATE KEY----- \ No newline at end of file +-----END PRIVATE KEY----- diff --git a/systemvm/agent/js/jquery.js b/systemvm/agent/js/jquery.js index b1ae21d8b23..a0fb8836089 100644 --- a/systemvm/agent/js/jquery.js +++ b/systemvm/agent/js/jquery.js @@ -16,4 +16,4 @@ * Released under the MIT, BSD, and GPL Licenses. * More information: http://sizzlejs.com/ */ -(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); \ No newline at end of file +(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); diff --git a/systemvm/agent/noVNC/app/locale/cs.json b/systemvm/agent/noVNC/app/locale/cs.json index 589145ef36e..eba5ee3de52 100644 --- a/systemvm/agent/noVNC/app/locale/cs.json +++ b/systemvm/agent/noVNC/app/locale/cs.json @@ -68,4 +68,4 @@ "Password:": "Heslo", "Send Password": "Odeslat heslo", "Cancel": "Zrušit" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/de.json b/systemvm/agent/noVNC/app/locale/de.json index 62e73360f50..15099d7d06d 100644 --- a/systemvm/agent/noVNC/app/locale/de.json +++ b/systemvm/agent/noVNC/app/locale/de.json @@ -66,4 +66,4 @@ "Password:": "Passwort:", "Cancel": "Abbrechen", "Canvas not supported.": "Canvas nicht unterstützt." -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/el.json b/systemvm/agent/noVNC/app/locale/el.json index f801251c59a..19cdb581bc1 100644 --- a/systemvm/agent/noVNC/app/locale/el.json +++ b/systemvm/agent/noVNC/app/locale/el.json @@ -66,4 +66,4 @@ "Password:": "Κωδικός Πρόσβασης:", "Cancel": "Ακύρωση", "Canvas not supported.": "Δεν υποστηρίζεται το στοιχείο Canvas" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/es.json b/systemvm/agent/noVNC/app/locale/es.json index b9e663a3d55..61365e2887b 100644 --- a/systemvm/agent/noVNC/app/locale/es.json +++ b/systemvm/agent/noVNC/app/locale/es.json @@ -65,4 +65,4 @@ "Password:": "Contraseña:", "Cancel": "Cancelar", "Canvas not supported.": "Canvas no soportado." -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/fr.json b/systemvm/agent/noVNC/app/locale/fr.json index 22531f73b92..51e45891a9a 100644 --- a/systemvm/agent/noVNC/app/locale/fr.json +++ b/systemvm/agent/noVNC/app/locale/fr.json @@ -75,4 +75,4 @@ "Password:": "Mot de passe :", "Send Credentials": "Envoyer les identifiants", "Cancel": "Annuler" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/it.json b/systemvm/agent/noVNC/app/locale/it.json index 6fd25702b78..552018d2584 100644 --- a/systemvm/agent/noVNC/app/locale/it.json +++ b/systemvm/agent/noVNC/app/locale/it.json @@ -69,4 +69,4 @@ "Password:": "Password:", "Send Credentials": "Invia Credenziale", "Cancel": "Annulla" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/ja.json b/systemvm/agent/noVNC/app/locale/ja.json index 43fc5bf38c6..e85edf9029d 100644 --- a/systemvm/agent/noVNC/app/locale/ja.json +++ b/systemvm/agent/noVNC/app/locale/ja.json @@ -69,4 +69,4 @@ "Password:": "パスワード:", "Send Credentials": "資格情報を送信", "Cancel": "キャンセル" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/ko.json b/systemvm/agent/noVNC/app/locale/ko.json index e4ecddcfda6..aa9c1109e1a 100644 --- a/systemvm/agent/noVNC/app/locale/ko.json +++ b/systemvm/agent/noVNC/app/locale/ko.json @@ -67,4 +67,4 @@ "Password:": "비밀번호:", "Send Password": "비밀번호 전송", "Cancel": "취소" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/nl.json b/systemvm/agent/noVNC/app/locale/nl.json index 0cdcc92a9b3..1ad75647b3b 100644 --- a/systemvm/agent/noVNC/app/locale/nl.json +++ b/systemvm/agent/noVNC/app/locale/nl.json @@ -70,4 +70,4 @@ "Password:": "Wachtwoord:", "Send Password": "Verzend Wachtwoord:", "Cancel": "Annuleren" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/pl.json b/systemvm/agent/noVNC/app/locale/pl.json index 006ac7a55f5..12a46564012 100644 --- a/systemvm/agent/noVNC/app/locale/pl.json +++ b/systemvm/agent/noVNC/app/locale/pl.json @@ -66,4 +66,4 @@ "Password:": "Hasło:", "Cancel": "Anuluj", "Canvas not supported.": "Element Canvas nie jest wspierany." -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/pt_BR.json b/systemvm/agent/noVNC/app/locale/pt_BR.json index aa130f764bf..42b16b6111f 100644 --- a/systemvm/agent/noVNC/app/locale/pt_BR.json +++ b/systemvm/agent/noVNC/app/locale/pt_BR.json @@ -69,4 +69,4 @@ "Password:": "Senha:", "Send Credentials": "Enviar credenciais", "Cancel": "Cancelar" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/ru.json b/systemvm/agent/noVNC/app/locale/ru.json index cab97396ec2..72bde7164b5 100644 --- a/systemvm/agent/noVNC/app/locale/ru.json +++ b/systemvm/agent/noVNC/app/locale/ru.json @@ -69,4 +69,4 @@ "Password:": "Пароль:", "Send Credentials": "Передача Учетных Данных", "Cancel": "Выход" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/sv.json b/systemvm/agent/noVNC/app/locale/sv.json index 077ef42c80b..91dff9e4da7 100644 --- a/systemvm/agent/noVNC/app/locale/sv.json +++ b/systemvm/agent/noVNC/app/locale/sv.json @@ -77,4 +77,4 @@ "Password:": "Lösenord:", "Send Credentials": "Skicka Användaruppgifter", "Cancel": "Avbryt" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/tr.json b/systemvm/agent/noVNC/app/locale/tr.json index 451c1b8a643..b92b4167252 100644 --- a/systemvm/agent/noVNC/app/locale/tr.json +++ b/systemvm/agent/noVNC/app/locale/tr.json @@ -66,4 +66,4 @@ "Password:": "Parola:", "Cancel": "Vazgeç", "Canvas not supported.": "Tuval desteklenmiyor." -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/zh_CN.json b/systemvm/agent/noVNC/app/locale/zh_CN.json index f0aea9af3e1..ee73eba31cc 100644 --- a/systemvm/agent/noVNC/app/locale/zh_CN.json +++ b/systemvm/agent/noVNC/app/locale/zh_CN.json @@ -66,4 +66,4 @@ "Connect": "连接", "Password:": "密码:", "Cancel": "取消" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/app/locale/zh_TW.json b/systemvm/agent/noVNC/app/locale/zh_TW.json index 8ddf813f084..b0368ceabe5 100644 --- a/systemvm/agent/noVNC/app/locale/zh_TW.json +++ b/systemvm/agent/noVNC/app/locale/zh_TW.json @@ -66,4 +66,4 @@ "Connect": "連線", "Password:": "密碼:", "Cancel": "取消" -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/core/input/uskeysym.js b/systemvm/agent/noVNC/core/input/uskeysym.js index 97c5ae499bd..7eda9a6b370 100644 --- a/systemvm/agent/noVNC/core/input/uskeysym.js +++ b/systemvm/agent/noVNC/core/input/uskeysym.js @@ -54,4 +54,4 @@ export default { ' ': 0x0020, /* U+0020 SPACE */ '\n': 0xff0d -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/core/ra2.js b/systemvm/agent/noVNC/core/ra2.js index 81a8a8952d7..d038608967b 100644 --- a/systemvm/agent/noVNC/core/ra2.js +++ b/systemvm/agent/noVNC/core/ra2.js @@ -564,4 +564,4 @@ export default class RSAAESAuthenticationState extends EventTargetMixin { set hasStarted(s) { this._hasStarted = s; } -} \ No newline at end of file +} diff --git a/systemvm/agent/noVNC/core/util/md5.js b/systemvm/agent/noVNC/core/util/md5.js index 49762ef9e6b..3834916c3e9 100644 --- a/systemvm/agent/noVNC/core/util/md5.js +++ b/systemvm/agent/noVNC/core/util/md5.js @@ -76,4 +76,4 @@ function add(d, g) { function rol(d, g) { return d << g | d >>> 32 - g; -} \ No newline at end of file +} diff --git a/systemvm/debian/etc/modprobe.d/pcspkr.conf b/systemvm/debian/etc/modprobe.d/pcspkr.conf index 892b51fef5b..433368f17af 100644 --- a/systemvm/debian/etc/modprobe.d/pcspkr.conf +++ b/systemvm/debian/etc/modprobe.d/pcspkr.conf @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -blacklist pcspkr \ No newline at end of file +blacklist pcspkr diff --git a/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-fcopy-daemon.service b/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-fcopy-daemon.service index 12a0b63c970..c249a3a0fcc 100644 --- a/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-fcopy-daemon.service +++ b/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-fcopy-daemon.service @@ -6,4 +6,4 @@ ConditionPathExists=/dev/vmbus/hv_fcopy ExecStart=/usr/sbin/hv_fcopy_daemon -n [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-kvp-daemon.service b/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-kvp-daemon.service index 534a25a7f24..47e68342ddb 100644 --- a/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-kvp-daemon.service +++ b/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-kvp-daemon.service @@ -5,4 +5,4 @@ Description=Hyper-V key-value pair (KVP) daemon ExecStart=/usr/sbin/hv_kvp_daemon -n [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/systemvm/debian/opt/cloud/bin/getRouterAlerts.sh b/systemvm/debian/opt/cloud/bin/getRouterAlerts.sh index 3f5f4a3b05c..f48478e7d02 100755 --- a/systemvm/debian/opt/cloud/bin/getRouterAlerts.sh +++ b/systemvm/debian/opt/cloud/bin/getRouterAlerts.sh @@ -52,4 +52,4 @@ if [ -n "$alerts" ]; then echo $alerts else echo "No Alerts" -fi \ No newline at end of file +fi diff --git a/systemvm/debian/opt/cloud/bin/patched.sh b/systemvm/debian/opt/cloud/bin/patched.sh index bfe0f64495a..8ebc1afa890 100644 --- a/systemvm/debian/opt/cloud/bin/patched.sh +++ b/systemvm/debian/opt/cloud/bin/patched.sh @@ -16,4 +16,4 @@ # specific language governing permissions and limitations # under the License. -ls -lrt $1 \ No newline at end of file +ls -lrt $1 diff --git a/systemvm/debian/opt/cloud/bin/setup/cksnode.sh b/systemvm/debian/opt/cloud/bin/setup/cksnode.sh index 0b5df04ded2..55bd4eaf31e 100755 --- a/systemvm/debian/opt/cloud/bin/setup/cksnode.sh +++ b/systemvm/debian/opt/cloud/bin/setup/cksnode.sh @@ -71,4 +71,4 @@ setup_k8s_node() { fi } -setup_k8s_node \ No newline at end of file +setup_k8s_node diff --git a/systemvm/debian/opt/cloud/bin/update_interface_config.sh b/systemvm/debian/opt/cloud/bin/update_interface_config.sh index 4b1e96b8d3c..53d81f7602f 100644 --- a/systemvm/debian/opt/cloud/bin/update_interface_config.sh +++ b/systemvm/debian/opt/cloud/bin/update_interface_config.sh @@ -60,4 +60,4 @@ if [ ! -z $interfaceName ]; then fi echo "Interface with IP ${ip} not found" -exit 1 \ No newline at end of file +exit 1 diff --git a/systemvm/debian/opt/cloud/testdata/vmp0001.json b/systemvm/debian/opt/cloud/testdata/vmp0001.json index 39ee78d0929..de3db3bb1b0 100644 --- a/systemvm/debian/opt/cloud/testdata/vmp0001.json +++ b/systemvm/debian/opt/cloud/testdata/vmp0001.json @@ -1 +1 @@ -{"ip_address":"172.16.1.102","password":"fnirq_cnffjbeq","type":"vmpassword"} \ No newline at end of file +{"ip_address":"172.16.1.102","password":"fnirq_cnffjbeq","type":"vmpassword"} diff --git a/test/metadata/func/templates_sync.xml b/test/metadata/func/templates_sync.xml index a03e4bf93b5..96d6362a744 100644 --- a/test/metadata/func/templates_sync.xml +++ b/test/metadata/func/templates_sync.xml @@ -1058,6 +1058,3 @@ under the License. - - - diff --git a/test/scripts/bootstrap-regression.sh b/test/scripts/bootstrap-regression.sh index 8328d1042a1..ff219dd47cb 100755 --- a/test/scripts/bootstrap-regression.sh +++ b/test/scripts/bootstrap-regression.sh @@ -34,4 +34,4 @@ cd scripts ./cleanparallel.sh ./deploy.sh -b ../cloud-management-dist -d -r sleep 300 -./regression.sh \ No newline at end of file +./regression.sh diff --git a/test/scripts/build-env.sh b/test/scripts/build-env.sh index 2a9a58626f0..299b6b6d097 100755 --- a/test/scripts/build-env.sh +++ b/test/scripts/build-env.sh @@ -27,5 +27,3 @@ fi CP=commons-httpclient-3.1.jar${PATHSEP}commons-logging-1.1.1.jar${PATHSEP}commons-codec-1.3.jar${PATHSEP}testclient.jar${PATHSEP}log4j-1.2.15.jar${PATHSEP}utils.jar${PATHSEP}./conf java -cp $CP com.vmops.test.longrun.BuildGuestNetwork $* - - diff --git a/test/scripts/checkOutOfMemory.sh b/test/scripts/checkOutOfMemory.sh index 08dccdafafa..cb5b595df45 100755 --- a/test/scripts/checkOutOfMemory.sh +++ b/test/scripts/checkOutOfMemory.sh @@ -34,4 +34,4 @@ jmap -dump:format=b,file=/root/dump/heap.bin.$t $pid sleep 1800 done fi -done \ No newline at end of file +done diff --git a/test/scripts/cleanparallel.sh b/test/scripts/cleanparallel.sh index fe72da7da69..0ccb546dacf 100755 --- a/test/scripts/cleanparallel.sh +++ b/test/scripts/cleanparallel.sh @@ -110,6 +110,3 @@ do echo "Starting cleanup on secondary storage $i"; cleanup_storage $i $SECONDARY_STORAGE_DIR done - - - diff --git a/test/scripts/deploy-and-run-regression.sh b/test/scripts/deploy-and-run-regression.sh index 5c2ad983b25..691a93046e7 100755 --- a/test/scripts/deploy-and-run-regression.sh +++ b/test/scripts/deploy-and-run-regression.sh @@ -45,4 +45,3 @@ scp -o BatchMode\ yes -r $src $host:$dest scp -o BatchMode\ yes -r "$srcbootstrapper" $host:$destbootstrapper ssh -o BatchMode\ yes $host $destbootstrapper - diff --git a/test/scripts/deploycluster.sh b/test/scripts/deploycluster.sh index 636a56b5e99..91111d98ff1 100755 --- a/test/scripts/deploycluster.sh +++ b/test/scripts/deploycluster.sh @@ -70,8 +70,3 @@ for ip in $ips; do echo "$ip" deploy_server $ip done - - - - - diff --git a/test/scripts/executeUserAPI.sh b/test/scripts/executeUserAPI.sh index 55107bc2b32..caf54b19f0f 100755 --- a/test/scripts/executeUserAPI.sh +++ b/test/scripts/executeUserAPI.sh @@ -30,5 +30,3 @@ DST='../src/' CP=${DST}commons-httpclient-3.1.jar${PATHSEP}${DST}commons-logging-1.1.1.jar${PATHSEP}${DST}commons-codec-1.4.jar${PATHSEP}${DST}testclient.jar${PATHSEP}.././conf java -cp $CP com.cloud.sample.UserCloudAPIExecutor - - diff --git a/test/scripts/run.sh b/test/scripts/run.sh index 987f70e6180..de1dc22b256 100755 --- a/test/scripts/run.sh +++ b/test/scripts/run.sh @@ -31,4 +31,3 @@ DST='../src/' CP=${DST}commons-httpclient-3.1.jar${PATHSEP}${DST}commons-logging-1.1.1.jar${PATHSEP}${DST}commons-codec-1.4.jar${PATHSEP}${DST}cloud-test.jar${PATHSEP}${DST}log4j.jar${PATHSEP}${DST}trilead-ssh2-build213.jar${PATHSEP}${DST}cloud-utils.jar${PATHSEP}.././conf java -cp $CP com.cloud.test.stress.TestClientWithAPI $* #java -cp $CP com.cloud.test.stress.StressTestDirectAttach $* - diff --git a/test/scripts/usage/allocated.sh b/test/scripts/usage/allocated.sh index 7ae57376023..bb7fa1b44bc 100755 --- a/test/scripts/usage/allocated.sh +++ b/test/scripts/usage/allocated.sh @@ -83,4 +83,3 @@ else echo "Skipping verification for account $i (the account either a) misses the second VM b) VM wasn't stopped 3) VM Stop failed " fi done - diff --git a/test/scripts/usage/volume_usage.sh b/test/scripts/usage/volume_usage.sh index c18493b0049..a3b21d6e5a0 100755 --- a/test/scripts/usage/volume_usage.sh +++ b/test/scripts/usage/volume_usage.sh @@ -157,5 +157,3 @@ else echo "Skipping verification for account $i (the account either a) misses root volume $volume_name b) volume wasn't deleted 3) Delete volume failed " fi done - - diff --git a/test/scripts/xen/corrupttemplate.sh b/test/scripts/xen/corrupttemplate.sh index 528dcf150f6..d26097f73ba 100755 --- a/test/scripts/xen/corrupttemplate.sh +++ b/test/scripts/xen/corrupttemplate.sh @@ -48,4 +48,4 @@ then echo "Was unable to corrupt template $path on host $host" exit 2 else exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/createfaketemplate.sh b/test/scripts/xen/createfaketemplate.sh index a68a0c3aeda..cc911228df6 100755 --- a/test/scripts/xen/createfaketemplate.sh +++ b/test/scripts/xen/createfaketemplate.sh @@ -50,4 +50,4 @@ then echo "Was unable to create fake template on host $host" exit 2 else exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/killvm.sh b/test/scripts/xen/killvm.sh index 43b81c90ec2..5aa9b1ed9be 100755 --- a/test/scripts/xen/killvm.sh +++ b/test/scripts/xen/killvm.sh @@ -49,4 +49,4 @@ then echo "Was unable to destroy the vm with name $name and uuid $uuid on host $ exit 2 else exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/listtemplate.sh b/test/scripts/xen/listtemplate.sh index bf3c58991f6..4b76b4aefd9 100755 --- a/test/scripts/xen/listtemplate.sh +++ b/test/scripts/xen/listtemplate.sh @@ -44,4 +44,4 @@ then echo "Template $path doesn't exist on storage host $host" exit 2 else exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/listvdi.sh b/test/scripts/xen/listvdi.sh index cf20bc6e786..9125b753d0f 100755 --- a/test/scripts/xen/listvdi.sh +++ b/test/scripts/xen/listvdi.sh @@ -55,4 +55,4 @@ then echo "VDI $name $uuid doesn't exist on host $host" exit 2 else exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/listvm.sh b/test/scripts/xen/listvm.sh index cd58e786b06..0a4e8b249fd 100755 --- a/test/scripts/xen/listvm.sh +++ b/test/scripts/xen/listvm.sh @@ -55,4 +55,4 @@ then echo "VM $name doesn't exist on host $host" exit 2 else exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/ms.sh b/test/scripts/xen/ms.sh index c06b1193183..d4a6cbce905 100755 --- a/test/scripts/xen/ms.sh +++ b/test/scripts/xen/ms.sh @@ -37,4 +37,4 @@ var=`ssh root@$host "service cloud-management $operation"` sleep 30 exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/removetemplate.sh b/test/scripts/xen/removetemplate.sh index dc7a63a48c4..dd632cf70ef 100755 --- a/test/scripts/xen/removetemplate.sh +++ b/test/scripts/xen/removetemplate.sh @@ -48,4 +48,4 @@ then echo "Was unable to remove template $path from host $host" exit 2 else exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/shutdown.sh b/test/scripts/xen/shutdown.sh index 69c51fef9ab..c5621b1b0a7 100755 --- a/test/scripts/xen/shutdown.sh +++ b/test/scripts/xen/shutdown.sh @@ -49,4 +49,4 @@ then echo "Was unable to shutdown the vm with name $name and uuid $uuid on host exit 2 else exit 0 -fi \ No newline at end of file +fi diff --git a/test/scripts/xen/sleep.sh b/test/scripts/xen/sleep.sh index f06798d0f15..68bde07ac96 100755 --- a/test/scripts/xen/sleep.sh +++ b/test/scripts/xen/sleep.sh @@ -30,4 +30,4 @@ do esac done -sleep $sleep \ No newline at end of file +sleep $sleep diff --git a/tools/apidoc/generatecommand.xsl b/tools/apidoc/generatecommand.xsl index a54170a7e74..e610d092bad 100644 --- a/tools/apidoc/generatecommand.xsl +++ b/tools/apidoc/generatecommand.xsl @@ -192,4 +192,3 @@ version="1.0"> - diff --git a/tools/apidoc/generatecustomcommand.xsl b/tools/apidoc/generatecustomcommand.xsl index d03cf56f9f9..ae480bcab0e 100644 --- a/tools/apidoc/generatecustomcommand.xsl +++ b/tools/apidoc/generatecustomcommand.xsl @@ -62,4 +62,3 @@ version="1.0"> - diff --git a/tools/apidoc/generategenericcommand.xsl b/tools/apidoc/generategenericcommand.xsl index 0d5dd140ebc..0e936673b56 100644 --- a/tools/apidoc/generategenericcommand.xsl +++ b/tools/apidoc/generategenericcommand.xsl @@ -54,4 +54,3 @@ version="1.0"> - diff --git a/tools/apidoc/generatetoc.xsl b/tools/apidoc/generatetoc.xsl index 687e626a5d6..72be6a13f89 100644 --- a/tools/apidoc/generatetoc.xsl +++ b/tools/apidoc/generatetoc.xsl @@ -1143,4 +1143,3 @@ version="1.0"> - diff --git a/tools/devcloud4/.gitignore b/tools/devcloud4/.gitignore index 3969b1b356b..107499dc991 100644 --- a/tools/devcloud4/.gitignore +++ b/tools/devcloud4/.gitignore @@ -1,4 +1,4 @@ tmp cookbooks *.lock -.vagrant \ No newline at end of file +.vagrant diff --git a/tools/devcloud4/binary-installation-advanced/Berksfile b/tools/devcloud4/binary-installation-advanced/Berksfile index 7ad09e1a382..918a6d70828 100644 --- a/tools/devcloud4/binary-installation-advanced/Berksfile +++ b/tools/devcloud4/binary-installation-advanced/Berksfile @@ -23,4 +23,4 @@ cookbook 'hostname' cookbook 'selinux' cookbook 'nat-router', git: 'http://github.com/imduffy15/cookbook_nat-router' cookbook 'cloudstack', git: 'https://github.com/imduffy15/cookbook_cloudstack-1' -cookbook 'binary-installation', path: '../common/binary-installation' \ No newline at end of file +cookbook 'binary-installation', path: '../common/binary-installation' diff --git a/tools/devcloud4/binary-installation-advanced/marvin.cfg.erb b/tools/devcloud4/binary-installation-advanced/marvin.cfg.erb index 6c847fb266d..bd65d3d0172 100644 --- a/tools/devcloud4/binary-installation-advanced/marvin.cfg.erb +++ b/tools/devcloud4/binary-installation-advanced/marvin.cfg.erb @@ -120,4 +120,4 @@ "passwd": "<%= @database_password %>", "db": "<%= @database %>" } -} \ No newline at end of file +} diff --git a/tools/devcloud4/binary-installation-basic/Berksfile b/tools/devcloud4/binary-installation-basic/Berksfile index 7ad09e1a382..918a6d70828 100644 --- a/tools/devcloud4/binary-installation-basic/Berksfile +++ b/tools/devcloud4/binary-installation-basic/Berksfile @@ -23,4 +23,4 @@ cookbook 'hostname' cookbook 'selinux' cookbook 'nat-router', git: 'http://github.com/imduffy15/cookbook_nat-router' cookbook 'cloudstack', git: 'https://github.com/imduffy15/cookbook_cloudstack-1' -cookbook 'binary-installation', path: '../common/binary-installation' \ No newline at end of file +cookbook 'binary-installation', path: '../common/binary-installation' diff --git a/tools/devcloud4/binary-installation-basic/marvin.cfg.erb b/tools/devcloud4/binary-installation-basic/marvin.cfg.erb index 62415c91ad2..721fc07d6c7 100644 --- a/tools/devcloud4/binary-installation-basic/marvin.cfg.erb +++ b/tools/devcloud4/binary-installation-basic/marvin.cfg.erb @@ -106,4 +106,4 @@ "passwd": "<%= @database_password %>", "db": "<%= @database %>" } -} \ No newline at end of file +} diff --git a/tools/devcloud4/common/binary-installation/attributes/default.rb b/tools/devcloud4/common/binary-installation/attributes/default.rb index 3b3eba0b02a..94662cebf53 100644 --- a/tools/devcloud4/common/binary-installation/attributes/default.rb +++ b/tools/devcloud4/common/binary-installation/attributes/default.rb @@ -35,4 +35,4 @@ default['cloudstack']['primary']['path'] = '/data/primary' default['cloudstack']['primary']['mgt_path'] = node['cloudstack']['primary']['path'] -default['cloudstack']['configuration'] = '/vagrant/marvin.cfg.erb' \ No newline at end of file +default['cloudstack']['configuration'] = '/vagrant/marvin.cfg.erb' diff --git a/tools/devcloud4/common/binary-installation/recipes/database_server.rb b/tools/devcloud4/common/binary-installation/recipes/database_server.rb index 28a374c8c7e..b9341a253f8 100644 --- a/tools/devcloud4/common/binary-installation/recipes/database_server.rb +++ b/tools/devcloud4/common/binary-installation/recipes/database_server.rb @@ -21,4 +21,3 @@ include_recipe 'mysql::server' include_recipe 'mysql::client' include_recipe 'cloudstack::mysql_conf' - diff --git a/tools/devcloud4/common/binary-installation/recipes/default.rb b/tools/devcloud4/common/binary-installation/recipes/default.rb index 6dcd47c5278..600ec9891b7 100644 --- a/tools/devcloud4/common/binary-installation/recipes/default.rb +++ b/tools/devcloud4/common/binary-installation/recipes/default.rb @@ -24,4 +24,4 @@ end include_recipe 'binary-installation::nfsshares' include_recipe 'binary-installation::database_server' -include_recipe 'binary-installation::management_server' \ No newline at end of file +include_recipe 'binary-installation::management_server' diff --git a/tools/devcloud4/common/development-installation/attributes/default.rb b/tools/devcloud4/common/development-installation/attributes/default.rb index 705423b1fef..f2c5712c75a 100644 --- a/tools/devcloud4/common/development-installation/attributes/default.rb +++ b/tools/devcloud4/common/development-installation/attributes/default.rb @@ -26,4 +26,4 @@ default['cloudstack']['primary']['path'] = '/data/primary' default['cloudstack']['primary']['mgt_path'] = node['cloudstack']['primary']['path'] default['cloudstack']['cloud-install-sys-tmplt'] = "#{Chef::Config['file_cache_path']}/cloud-install-sys-tmplt" -default['cloudstack']['createtmplt'] = "#{Chef::Config['file_cache_path']}/createtmplt.sh" \ No newline at end of file +default['cloudstack']['createtmplt'] = "#{Chef::Config['file_cache_path']}/createtmplt.sh" diff --git a/tools/devcloud4/common/development-installation/recipes/database_server.rb b/tools/devcloud4/common/development-installation/recipes/database_server.rb index 28a374c8c7e..b9341a253f8 100644 --- a/tools/devcloud4/common/development-installation/recipes/database_server.rb +++ b/tools/devcloud4/common/development-installation/recipes/database_server.rb @@ -21,4 +21,3 @@ include_recipe 'mysql::server' include_recipe 'mysql::client' include_recipe 'cloudstack::mysql_conf' - diff --git a/tools/devcloud4/common/development-installation/recipes/default.rb b/tools/devcloud4/common/development-installation/recipes/default.rb index 617acc7ff86..188d923854f 100644 --- a/tools/devcloud4/common/development-installation/recipes/default.rb +++ b/tools/devcloud4/common/development-installation/recipes/default.rb @@ -24,4 +24,4 @@ end include_recipe 'development-installation::nfsshares' include_recipe 'development-installation::system_templates' -include_recipe 'development-installation::database_server' \ No newline at end of file +include_recipe 'development-installation::database_server' diff --git a/tools/devcloud4/common/development-installation/recipes/system_templates.rb b/tools/devcloud4/common/development-installation/recipes/system_templates.rb index 7723f26f366..9601e7bc6ca 100644 --- a/tools/devcloud4/common/development-installation/recipes/system_templates.rb +++ b/tools/devcloud4/common/development-installation/recipes/system_templates.rb @@ -35,4 +35,4 @@ cloudstack_system_template 'xenserver' do nfs_server node['cloudstack']['secondary']['host'] url node['cloudstack']['hypervisor_tpl']['xenserver'] action :create -end \ No newline at end of file +end diff --git a/tools/devcloud4/prefill.sql b/tools/devcloud4/prefill.sql index d06de509b41..4213cd9d68b 100644 --- a/tools/devcloud4/prefill.sql +++ b/tools/devcloud4/prefill.sql @@ -31,4 +31,4 @@ REPLACE INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'e REPLACE INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'expunge.interval', '60'); REPLACE INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'management.network.cidr', '0.0.0.0/0'); REPLACE INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'secstorage.allowed.internal.sites', '0.0.0.0/0'); -UPDATE `cloud`.`vm_template` SET unique_name="Macchinina",name="Macchinina",url="http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-xen.vhd.bz2",checksum="30985504bc31bf0cd3b9d2c6ca7944d3",display_text="Macchinina" where id=5; \ No newline at end of file +UPDATE `cloud`.`vm_template` SET unique_name="Macchinina",name="Macchinina",url="http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-xen.vhd.bz2",checksum="30985504bc31bf0cd3b9d2c6ca7944d3",display_text="Macchinina" where id=5; diff --git a/tools/docker/Dockerfile.smokedev b/tools/docker/Dockerfile.smokedev index 881e1005678..4476f6a3d5f 100644 --- a/tools/docker/Dockerfile.smokedev +++ b/tools/docker/Dockerfile.smokedev @@ -140,4 +140,4 @@ CMD ["/usr/bin/supervisord"] # # cat /root/docker_run_tests.sh # for instructions -# \ No newline at end of file +# diff --git a/tools/eclipse/set-eclipse-profile.sh b/tools/eclipse/set-eclipse-profile.sh index c0cc9a9ca80..70dc8d41b87 100644 --- a/tools/eclipse/set-eclipse-profile.sh +++ b/tools/eclipse/set-eclipse-profile.sh @@ -23,4 +23,4 @@ for file in `find . -name org.eclipse.m2e.core.prefs | xargs`; do echo Replacing $file; sed -i -e s/activeProfiles=/activeProfiles=eclipse/g $file; fi; -done \ No newline at end of file +done diff --git a/tools/git/prepare-commit-msg b/tools/git/prepare-commit-msg index f957c183179..dd801b04db9 100755 --- a/tools/git/prepare-commit-msg +++ b/tools/git/prepare-commit-msg @@ -101,4 +101,3 @@ case "$2,$3" in run_generic_commit $1 ;; esac - diff --git a/tools/marvin/marvin/misc/build/vm-start.sh b/tools/marvin/marvin/misc/build/vm-start.sh index e23f434b973..86d7cc5b0fe 100755 --- a/tools/marvin/marvin/misc/build/vm-start.sh +++ b/tools/marvin/marvin/misc/build/vm-start.sh @@ -53,4 +53,3 @@ $(xe vm-param-set HVM-boot-params:order=nc uuid=$vmuuid) #Minimum mem requirements for RHEL/Ubuntu $(xe vm-memory-limits-set static-min=1GiB static-max=1GiB dynamic-min=1GiB dynamic-max=1GiB uuid=$vmuuid) $(xe vm-start uuid=$vmuuid) - diff --git a/tools/ngui/static/bootstrap/js/bootstrap.min.js b/tools/ngui/static/bootstrap/js/bootstrap.min.js index 319a85dfd43..8f130f0e76a 100644 --- a/tools/ngui/static/bootstrap/js/bootstrap.min.js +++ b/tools/ngui/static/bootstrap/js/bootstrap.min.js @@ -4,4 +4,4 @@ * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ -!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in").attr("aria-hidden",!1),b.enforceFocus(),c?b.$element.one(a.support.transition.end,function(){b.$element.focus().trigger("shown")}):b.$element.focus().trigger("shown")})},hide:function(b){b&&b.preventDefault();var c=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,this.escape(),a(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),a.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var b=this;a(document).on("focusin.modal",function(a){b.$element[0]!==a.target&&!b.$element.has(a.target).length&&b.$element.focus()})},escape:function(){var a=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(b){b.which==27&&a.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),b.hideModal()},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),b.hideModal()})},hideModal:function(){var a=this;this.$element.hide(),this.backdrop(function(){a.removeBackdrop(),a.$element.trigger("hidden")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},backdrop:function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('