On Tue, Jun 11, 2013 at 05:18:37PM +0000, Kelven Yang wrote: > I just fixed a critical bug that could cause XenServer host to be out of > service. I would like the fix to be merged into 4.1.1 release > https://issues.apache.org/jira/browse/CLOUDSTACK-2925 > > > Kelven
In cherry-picking this into the 4.1 branch, the following conflict results: error: could not apply f38c4e9... Bug CS-17825: Don't rely on XS to cleanup idle session but proactively close it from console proxy hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' Here's git status: # On branch 4.1 # Changes to be committed: # #modified: console-proxy/src/com/cloud/consolesoleproxy/ConsoleProxyGCThread.java #modified: console-proxy/src/com/cloud/consoleproxy/consoleproxyConsoleProxyVncClient.java #modified: console-proxy/src/com/cloud/comnsoleproxy/vnc/VncClientPacketSender.java #modified: console-proxy/srcrc/com/cloud/consoleproxy/vnc/VncServerPacketReceiver.java # # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # #deleted by us: services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java # Should I simply delete ConsoleProxyClientBase.java in 4.1?
