HI Daan, Thanks a lot for committing it! Sorry for the troubles, and I will do what you said next time if I upload the patch (thanks for the suggestions)! Cheers! Ding
On Apr 15, 2014, at 1:52 AM, Daan Hoogland <daan.hoogl...@gmail.com> wrote: > it applies, > > I won't push it like this though. The comment says 'squash 6242 commits' so i > will take the liberty of changing it to something like 'CLOUDSTACK-6242: > exception handling improvements'. > > Also I'd appriciate it if you upload to reviewboard next time. This make > reviewing easier for me. It gives me the chance to you diffs between your > diffs so after a big diff I can see if nothing deteriorated next time. For > now I'll just edit the comment and apply (after a unit test run). > > regards, > Daan > > > > > On Mon, Apr 14, 2014 at 11:18 PM, Ding Yuan <y...@ece.utoronto.ca> wrote: > Hi Daan, > Sorry about that. Rebased my patch on the latest master. Attaching the patch. > Please let me know if it still doesn’t work... > thanks! > Ding > > On Apr 14, 2014, at 3:04 PM, Daan Hoogland <daan.hoogl...@gmail.com> wrote: > >> thanks Ding, >> >> it doesn't apply, I'm afraid. Can you rebase it to latest master? Make sure >> it is only one commit. >> >> >> On Mon, Apr 14, 2014 at 8:48 PM, Ding Yuan <y...@ece.utoronto.ca> wrote: >> Hi Daan, >> Here you go! Please let me know if this is not what you want... >> Thanks a lot for this! >> >> Ding >> >> >> On Apr 14, 2014, at 2:13 PM, daan Hoogland <daan.hoogl...@gmail.com> wrote: >> >>> >>> This is an automatically generated e-mail. To reply, visit: >>> https://reviews.apache.org/r/19917/ >>> >>> Ding, >>> >>> sorry for the late reaction. I forgot to look at your patch last week. >>> >>> Can you create the patch with 'git format-patch' ? I want to apply it with >>> 'git am -s <patch-name>' >>> >>> regards, >>> Daan >>> >>> - daan Hoogland >>> >>> >>> On April 5th, 2014, 3:16 a.m. UTC, Ding Yuan wrote: >>> >>> Review request for cloudstack, Alena Prokharchyk, Alex Huang, Chiradeep >>> Vittal, daan Hoogland, edison su, David Nalley, Laszlo Hornyak, Mike >>> Tutkowski, Prachi Damle, and Venkata Siva Vijayendra Bhamidipati. >>> By Ding Yuan. >>> Updated April 5, 2014, 3:16 a.m. >>> >>> Repository: cloudstack-git >>> Description >>> >>> This is the patch for JIRA-6242. See >>> https://issues.apache.org/jira/browse/CLOUDSTACK-6242 for more details. >>> Thanks! >>> Diffs >>> >>> engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java >>> (0d41bc1) >>> engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java >>> (01508a4) >>> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java >>> (3e088db) >>> engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java >>> (4b6818e) >>> engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java (ea5039f) >>> engine/schema/src/com/cloud/host/dao/HostDaoImpl.java (426c90d) >>> engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java >>> (e42eaf4) >>> engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java (34fdca5) >>> engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java (58dd916) >>> engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java (5e9c2f0) >>> engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java (1f382d6) >>> engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java >>> (6ed1274) >>> framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java >>> (83c8a42) >>> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java >>> (0ad6dc4) >>> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java >>> (b779085) >>> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java >>> (e512046) >>> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java >>> (af6a77a) >>> server/src/com/cloud/resource/ResourceManagerImpl.java (f9a59ba) >>> server/src/com/cloud/server/ConfigurationServerImpl.java (b8da4c8) >>> services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java >>> (06f21d3) >>> utils/src/com/cloud/utils/net/NetUtils.java (6350986) >>> View Diff >>> >> >> >> >> >> >> -- >> Daan > > > > > > -- > Daan
