Commit Graph

310 Commits

Author SHA1 Message Date
Edison Su 5b11e67a18 Agent disconnected due to so many Fencecommand send to agent, cause agent can't get pingaswer from mgt server, then agent thinks it's ping timeout, reconnect to mgt server. 2012-02-09 14:56:41 -08:00
David Nalley 1048a42a24 fixing more whitespace issues 2012-01-25 16:55:32 -05:00
David Nalley 9872f074de just a few more whitespace issues 2012-01-25 03:00:36 -05:00
David Nalley 79b1584e74 cleaning up a few more whitespace issues 2012-01-25 02:56:55 -05:00
David Nalley 49ebeb901e fixing more whitespace issues 2012-01-25 00:18:37 -05:00
David Nalley 3fb42e3092 cleaning up more whitespace issues, complying with style guide 2012-01-24 22:53:59 -05:00
David Nalley 9a323b9f09 fixing some whitespace issues and line length issues to conform to the style guide 2012-01-24 22:44:43 -05:00
Edison Su ecab972060 execute fencecommand in seq for kvm, as there are only 5 default nio reading work threads on kvm agent. pinganswer may not be got serviced immediately, then agent will reconnect to mgt server again and again 2012-01-20 17:04:27 -08:00
Edison Su bced9a6e48 advanced startup command 2012-01-20 11:54:32 -08:00
Edison Su 5fcaa5a659 for windows vm, use localtime 2012-01-19 15:07:03 -08:00
Edison Su 46257f71d5 add debian 6 as pv as guest 2012-01-17 17:00:58 -08:00
Edison Su 15b57e6974 fix multiple data disks booting issue on windows vm 2012-01-13 18:36:53 -08:00
Edison Su 1d352f1e2c bug 12148: add checkpoint for storage migration
status 12148: resolved fixed
2012-01-13 15:19:14 -08:00
Edison Su a7daf4b9b4 set kvm HA heartbeat log level to warn 2012-01-12 14:45:53 -08:00
frank 52610ffcb3 add copyright header to shell scripts 2012-01-11 18:41:53 -08:00
Edison Su fe667e949e fix Maintenance releated issues with kvm:
1. put host into Maintenance, will send a Maintenance command to host, tell host that do not reconnect to mgt server
2. cancel Maintenance, will ssh into kvm host, and restart cloud-agent, which will reconnect to host
2012-01-11 17:36:58 -08:00
Edison Su 470ec2cabc bug 10586: apply Nils's patch
status 10586: resolved fixed
2012-01-10 16:20:34 -08:00
frank 30680542bf Bug 12777 - Add storage network configuration into CloudStack
add storage network support for KVM
2012-01-06 11:07:14 -08:00
Edison Su b39d29ef76 bug 12898:fix storage related bugs
status 12898: resolved fixed
2012-01-05 18:07:12 -08:00
Edison Su 653290a85c set creating template timeout from cmds.timeout 2011-12-20 18:12:41 -08:00
Edison Su 031671edd3 bug 12192: umount iso if it's dettached, or vm is stopped
status 12192: resolved fixed
2011-12-20 16:46:48 -08:00
Edison Su 56fcfd01bd bug 12627: if nic stats less than 0, just return 0
status 12627: resolved fixed
2011-12-19 18:04:10 -08:00
frank 761069440e Bug 12194 - Ubuntu init script can fall into infinite loop
Bug 11723 - (Ubuntu Install) Management Server service won't restart

patch from community

status 11723: resolved fixed
2011-12-19 14:50:04 -08:00
Edison Su da5fb5097c put the default network as cloudbr0, if not specified 2011-12-15 17:06:32 -08:00
Edison Su e60f356f62 set the cpu weight based on cpu * cores 2011-12-15 15:13:33 -08:00
Naredula Janardhana Reddy e4d94650ea Bug 12449: KVM-Default network rules for system vm and uservm based on Isolation Type. 2011-12-13 17:43:20 +05:30
Edison Su dfa9ae51bc fix reboot vm, then attached disk is lost 2011-12-06 11:09:33 -08:00
Edison Su 2e79da0ce5 kvm is working now 2011-12-05 18:07:00 -08:00
Naredula Janardhana Reddy 09905b641b bug 10617: merge code from branch bug10617. 2011-12-01 14:17:52 +05:30
Naredula Janardhana Reddy f1b99f4f07 Revert "bug 10617: merging code from branch bug10617"
This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
2011-11-11 20:23:26 +05:30
frank caf945bca2 Don't allow Agent send out StartupCommand if it can not get its local IP address,
otherwise mgmt server will get an incomplete StartupCommand
2011-11-10 17:37:45 -08:00
Alex Huang d6c22c42fe Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-11-10 15:26:39 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Naredula Janardhana Reddy 02adbd4bd3 bug 10617: merging code from branch bug10617 2011-11-10 15:23:48 +05:30
Edison Su 6841e265d3 bug 10330: finally merge Rommer's CLVM patch
status 10330: resolved fixed
2011-11-02 18:03:58 -07:00
Edison Su 15641ef1a7 fix build 2011-11-01 17:06:39 -07:00
Edison Su dd6ed6b108 bug 10330: refactor storage code befor merge clvm code 2011-10-31 20:25:26 -07:00
anthony 46dac852fa Merge branch 'swift'
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
anthony 510d1dbef7 Swift : upload template to Swift and sync between Swift and secondary storage 2011-10-24 18:48:16 -07:00
Edison Su 92eaf49f29 Add storage migration 2011-10-24 15:59:47 -07:00
anthony 0df249172d Swift: DeleteSnapshotBackupCommand and DeleteSnapshotsDirCommand are executed in SSVM 2011-10-21 19:53:48 -07:00
prachi 8570b25506 NAAS: APIServer changes to introduce framework to read commands from pluggable components having separate commands.properties file
Changes:
- Added a new interface 'PluggableService'
- Any component that can be packaged separately from cloudstack, can implement this interface and provide its own property file listing the API commands the component supports
- As an example have made VirtualNetworkApplianceService pluggable and a new configureRouter command is added
- ComponentLocator reads all the pluggable service from componentLibrary or from components.xml and instantiates the services.
- As an example, DefaultComponentLibrary adds the pluggable service 'VirtualNetworkApplianceService'
- Also components.xml.in has an entry to show how a pluggable service can be added, but it is commented out.
- APIServer now reads the commands for each pluggable service and when a command for such a service is called, APIServer sets the required instance of the pluggable service in the coomand.
- To do this a new annotation '@PlugService' is added that is processed by APIServer. This eliminates the dependency on the BaseCmd to instantiate the service instances.
2011-10-11 17:34:57 -07:00
Edison Su 29e389eb87 bug 11669: report host cpu freq from /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq. It's a bug in libvirt: http://comments.gmane.org/gmane.comp.emulators.libvirt/33277
status 11669: resolved fixed

bug 11669: divide 1000, mgt server needs Mhz
status 11669: resolved fixed
2011-10-10 18:44:59 -07:00
Edison Su d509c777a6 Fixed: only the first snapshot got backedup to secondary storage, if multple snapshot taken.
Reviewed-by: anthony
2011-09-22 15:04:52 -07:00
Edison Su a04f436147 bug 11423: get storage pool stats from "df --total" instead from libvirt
status 11423: resolved fixed
2011-09-13 18:53:21 -07:00
Edison Su 7bbe757d5b Add "Other PV" for kvm, to install pv driver in windows:
1. create a VM from iso/template whose guest os type is "Windows*"
2. attach a disk to windows VM
3. install virtio disk driver
4. stop the vm, and create template from it, chose guest os type as "Other PV"
5. create vm from the template created at step 4. Then this vm will have virtio disk, and virtio nic. Need to install virtio nic driver after VM booting up.
2011-09-13 11:07:47 -07:00
Chiradeep Vittal f41b352d36 revert egress rules implementation pending review
Reverts a19212703b9734ebd44ebf55cfdd81ebdc9d7fe4
Reverts 24e4e44b8f0712a37147a3777833de3f9e24829e
2011-09-12 14:45:58 -07:00
Chiradeep Vittal d817f3c364 Revert "bug 10617: Added Egress rules to Security groups."
revert pending review

This reverts commit a19212703b9734ebd44ebf55cfdd81ebdc9d7fe4.
2011-09-12 14:45:58 -07:00
frank 1ce0ad67c8 Bug 9479 - provide option for built in https
status 9479: resolved fixed
2011-09-01 16:01:28 -07:00
anthony f47bf2e4cf fixed eclipse classpath 2011-08-31 13:35:37 -07:00
Naredula Janardhana Reddy 854f81962f bug 10617: Added Egress rules to Security groups.
Description :
   API's:
     -  Two new api's authorizeSecurityGroupEgress,revokeSecurityGroupEgressCmd are added. These two API's are similer to ingress rule API's.
           - authorizeSecurityGroupEgress :Authorizes a particular egress rule for this security group . Usageof API is very similer to that of authorizeSecurityGroupIngress except that instead of source cidr  there will be destination cidr. By default like ingress, all the outgoing flows are blocked.
           - revokeSecurityGroupEgress : It is similer to revokeSecurityGroupIngress api, It removes the egress rule.
     -  listSecurityGroup API's response changed. It include's egress list apart from the existing ingress rules in the output of the API.

   Hypervisors :
      - It is implemented in Xen and KVM.

   Pending Tasks :  Blocking using destination security groups.

   Previous commits: c9fda641673df7701f44963ef27e1d488f121219 , 24e4e44b8f0712a37147a3777833de3f9e24829e
2011-08-30 16:28:35 +05:30
Edison Su 4e7d4abe3d bug 10931: if local.storage.uuid not found, generate a new one instead of throw exception
status 10931: resolved fixed
2011-08-29 11:06:55 -07:00
Naredula Janardhana Reddy 9feb05ac13 bug 10617: This is Intermediate commit for Egress rules implementation in security groups.
previous commit: c9fda641673df7701f44963ef27e1d488f121219 ( this under bug 1067, typing error)
        changes: 1) partially implemented  listing of egress rules along with ingress rules.
                 2) partially implemneted egress rules for KVM
2011-08-25 12:18:33 +05:30
frank b3478c377e Full opensource 2011-08-23 19:52:19 -07:00
alena 8a7feb8ec1 Merge branch '2.2.y'
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
Kelven Yang 085bd36035 bug 11137: don't start HTTP listen if it is already started 2011-08-15 18:57:46 -07:00
Kelven Yang ced9e1b25e bug 11137: don't start HTTP listen if it is already started 2011-08-15 18:57:06 -07:00
Edison Su 71da03b69d bug 10809: add copyvolume for kvm
status 10809: resolved fixed
2011-08-09 15:33:32 -07:00
Edison Su 2c56b83da6 bug 10809: add copyvolume for kvm
status 10809: resolved fixed
2011-08-09 15:33:18 -07:00
anthony 37dcec77bb Bug 10197:
implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host

Conflicts:

	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-08-02 17:31:36 -07:00
anthony dc7ff2b5ad Bug 10197:
implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
2011-08-02 16:52:24 -07:00
Edison Su 8bcad6960c add rhel6.1 support 2011-07-29 20:05:01 -07:00
Edison Su 22483a9c13 add RHEL 6.1 support 2011-07-29 19:14:15 -07:00
Edison Su c3174664de after vm reboot, change the security group if needed 2011-07-29 15:28:16 -07:00
frank 262e6784e5 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:41:38 -07:00
frank 1381c58fa1 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:32:12 -07:00
frank 4c9faa84ec Clean up unused files
agent/patch/patch.tgz
agent/patch/redopatch.sh
2011-07-21 17:42:47 -07:00
Edison Su 7e195ae6ae bug 10440: ipassoca failed, if the public network is untagged
status 10440: resolved fixed
2011-07-08 13:50:02 -07:00
Edison Su 827c71a9f0 wait for 30s, after stop agent 2011-07-08 13:33:15 -07:00
Edison Su e72fed3782 fix meta data for cloudzone 2011-07-08 13:33:05 -07:00
Edison Su 8becb77674 try 5 times if write heartbeat failed 2011-07-08 13:32:17 -07:00
Edison Su a180e3f341 if iso is installed, don't include it into ssvm 2011-07-08 13:32:05 -07:00
Edison Su 1c67301146 don't include the whole /usr/share/java/ directory in classpath, or you will get stackoverflow, and delete vm data folder after vm stopped 2011-07-08 13:31:00 -07:00
Edison Su 5bee237972 fix NPE when stopvm 2011-07-08 13:19:49 -07:00
Edison Su 0574b84e35 bug 9793: remove the thirdparty jar files, then size of cloudzone tar ball is reduced to 4M.
status 9793: resolved fixed
2011-07-08 13:18:14 -07:00
Edison Su e5833731f8 reduce cloudzone package size, hopefully down to < 5M 2011-07-08 13:17:52 -07:00
Edison Su bc64656e6a reduce agent package size 2011-07-08 13:17:39 -07:00
Edison Su 77add5aa93 bug 10212: Finally, user data works. Don't return newline to them
status 10212: resolved, fixed
2011-07-08 13:17:14 -07:00
Edison Su 4a4b03fa01 fix user data 2011-07-08 13:02:38 -07:00
Edison Su d6e0d282d8 bug 9896: RHEL 6 doesn;t support to attach an SCSI disk to a windows VM, then I have to attach a virtio disk.
So for a windows guest, the root disk is an IDE disk(in case there is no virtio driver installed inside guest), but all the data disks will be virtio disks.
That means if you want this feature, people need to install virtio disk driver inside windows guest to get data disk work.
status 9896: resolved fixed
2011-07-08 13:02:38 -07:00
Edison Su 3166b237cb bug 10440: ipassoca failed, if the public network is untagged
status 10440: resolved fixed
2011-06-27 16:08:30 -04:00
Edison Su cd6eba3cde wait for 30s, after stop agent 2011-06-22 17:47:29 -04:00
Sheng Yang 345d747913 Add more _selector.close()
Also add more log.
2011-06-22 14:23:41 -07:00
Edison Su 0377c6bf0d fix meta data for cloudzone 2011-06-22 17:02:12 -04:00
Sheng Yang 64b2293a50 Add more _selector.close()
Also add more log.
2011-06-22 14:24:12 -07:00
Alex Huang a254e90ab3 Renamed IPAssoc to IpAssoc to be consistent with agent commands 2011-06-21 10:15:42 -07:00
Alex Huang 8459ae0beb Renamed IPAssoc to IpAssoc to be consistent with agent commands 2011-06-21 09:25:29 -07:00
Edison Su 5483bc21de try 5 times if write heartbeat failed 2011-06-17 17:38:58 -04:00
Edison Su 0a8421fe66 if iso is installed, don't include it into ssvm 2011-06-17 15:45:28 -04:00
Edison Su 980dd69478 don't include the whole /usr/share/java/ directory in classpath, or you will get stackoverflow, and delete vm data folder after vm stopped 2011-06-16 12:14:24 -04:00
Edison Su 1fa00d14b1 fix NPE when stopvm 2011-06-15 15:28:35 -04:00
Edison Su fc2ed28227 bug 9793: remove the thirdparty jar files, then size of cloudzone tar ball is reduced to 4M.
status 9793: resolved fixed
2011-06-14 15:13:14 -04:00
Edison Su db7a01766c reduce cloudzone package size, hopefully down to < 5M 2011-06-14 14:35:38 -04:00
Edison Su 5b19a5e731 reduce agent package size 2011-06-13 18:14:51 -04:00
Edison Su 4d3481ac5e bug 10212: Finally, user data works. Don't return newline to them
status 10212: resolved, fixed
2011-06-10 15:34:06 -04:00
Edison Su 2da052a463 fix user data 2011-06-09 18:04:48 -04:00
Edison Su e7365fd143 bug 9896: RHEL 6 doesn;t support to attach an SCSI disk to a windows VM, then I have to attach a virtio disk.
So for a windows guest, the root disk is an IDE disk(in case there is no virtio driver installed inside guest), but all the data disks will be virtio disks.
That means if you want this feature, people need to install virtio disk driver inside windows guest to get data disk work.
status 9896: resolved fixed
2011-06-08 16:11:02 -04:00
Edison Su 358fb9aba6 add wait for network before starting agent 2011-06-02 22:38:13 -04:00
Edison Su 47d52ad937 Never get the upstart script stable enough
fall back to systemV init script
Revert "Try upstart init script in the next round"

This reverts commit da56f8e92e74b2e06df66da03e1b77b3a13cb97d.
2011-06-02 22:38:13 -04:00
Edison Su 5caafcbcb0 change log level to debug 2011-06-01 17:39:02 -04:00