You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by du...@apache.org on 2014/09/16 11:51:32 UTC
[1/3] git commit: updated refs/heads/bugfix/CID-1232342 to 2fad109
Repository: cloudstack
Updated Branches:
refs/heads/bugfix/CID-1232342 [created] 2fad1095b
spread tests over multiple travis environments
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/32570c91
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32570c91
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32570c91
Branch: refs/heads/bugfix/CID-1232342
Commit: 32570c9107f8974b1ffac029c5fb81a37a349439
Parents: 50990c4
Author: imduffy15 <ia...@ianduffy.ie>
Authored: Tue Sep 16 10:00:08 2014 +0100
Committer: imduffy15 <ia...@ianduffy.ie>
Committed: Tue Sep 16 10:00:08 2014 +0100
----------------------------------------------------------------------
.travis.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32570c91/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index bc9b713..5de9ce3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,12 @@ jdk:
notifications:
email: false
env:
-- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners test_disk_offerings test_global_settings test_guest_vlan_range test_iso test_multipleips_per_nic test_network test_non_contigiousvlan test_over_provisioning"
-- TESTS="test_portable_publicip test_primary_storage test_privategw_acl test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot test_resource_detail test_routers"
-- TESTS="test_secondary_storage test_service_offerings test_ssvm test_templates misc/test_deploy_vm test_vm_life_cycle test_volumes test_vpc_vpn"
+- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners test_disk_offerings test_global_settings test_guest_vlan_range"
+- TESTS="test_iso test_multipleips_per_nic test_network test_non_contigiousvlan test_over_provisioning"
+- TESTS="test_portable_publicip test_primary_storage test_privategw_acl test_public_ip_range test_pvlan"
+- TESTS="test_regions test_reset_vm_on_reboot test_resource_detail test_routers test_secondary_storage"
+- TESTS="test_service_offerings test_ssvm test_templates test_volumes test_vpc_vpn"
+- TESTS="misc/test_deploy_vm test_vm_life_cycle"
before_install: travis_wait 30 ./tools/travis/before_install.sh
install: ./tools/travis/install.sh
before_script: travis_wait 30 ./tools/travis/before_script.sh
[3/3] git commit: updated refs/heads/bugfix/CID-1232342 to 2fad109
Posted by du...@apache.org.
Fix CID-1232342
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fad1095
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fad1095
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fad1095
Branch: refs/heads/bugfix/CID-1232342
Commit: 2fad1095bfed0babe6e778c2fbc3da1e64cae566
Parents: d7ce8d8
Author: imduffy15 <ia...@ianduffy.ie>
Authored: Tue Sep 16 10:50:02 2014 +0100
Committer: imduffy15 <ia...@ianduffy.ie>
Committed: Tue Sep 16 10:50:02 2014 +0100
----------------------------------------------------------------------
.../com/globo/globodns/cloudstack/resource/GloboDnsResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fad1095/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
index c167845..31759af 100644
--- a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
+++ b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
@@ -362,7 +362,7 @@ public class GloboDnsResource extends ManagerBase implements ServerResource {
Record record = this.searchRecord(name, domainId);
if (record == null) {
// Create new record
- record = _globoDns.getRecordAPI().createRecord(domainId, name, ip, type);
+ _globoDns.getRecordAPI().createRecord(domainId, name, ip, type);
s_logger.info("Created record " + name + " in domain " + domainId);
} else {
if (!ip.equals(record.getContent())) {
[2/3] git commit: updated refs/heads/bugfix/CID-1232342 to 2fad109
Posted by du...@apache.org.
Adjust travis environments to try get each one to finish within 30mins.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7ce8d80
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7ce8d80
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7ce8d80
Branch: refs/heads/bugfix/CID-1232342
Commit: d7ce8d80be6813d646f0db45cb602b4a563b87ce
Parents: 32570c9
Author: imduffy15 <ia...@ianduffy.ie>
Authored: Tue Sep 16 10:40:52 2014 +0100
Committer: imduffy15 <ia...@ianduffy.ie>
Committed: Tue Sep 16 10:40:52 2014 +0100
----------------------------------------------------------------------
.travis.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7ce8d80/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 5de9ce3..20d7162 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,11 +25,12 @@ notifications:
email: false
env:
- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners test_disk_offerings test_global_settings test_guest_vlan_range"
-- TESTS="test_iso test_multipleips_per_nic test_network test_non_contigiousvlan test_over_provisioning"
- TESTS="test_portable_publicip test_primary_storage test_privategw_acl test_public_ip_range test_pvlan"
- TESTS="test_regions test_reset_vm_on_reboot test_resource_detail test_routers test_secondary_storage"
- TESTS="test_service_offerings test_ssvm test_templates test_volumes test_vpc_vpn"
- TESTS="misc/test_deploy_vm test_vm_life_cycle"
+- TESTS="test_iso test_multipleips_per_nic"
+- TESTS="test_network test_non_contigiousvlan test_over_provisioning"
before_install: travis_wait 30 ./tools/travis/before_install.sh
install: ./tools/travis/install.sh
before_script: travis_wait 30 ./tools/travis/before_script.sh