Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tomcat7 #6

Merged
merged 2 commits into from
Jul 11, 2012
Merged

Tomcat7 #6

merged 2 commits into from
Jul 11, 2012

Conversation

hazendaz
Copy link
Member

fixed pull request against tomcat7 version.

Full source based dropped in place.  Please note that differences are in
line breaks.  It appears that both eclipse and git hub gui will remove
formats for line break that show as squigly square.  Other than that,
code is the same in most locations.  Also, tomcat base updated from
7.0.4 to 7.0.29.  Some methods were removed as they were deprectated.
Others were retained due to usage currently.
three more files that missed the first commit.
dblock added a commit that referenced this pull request Jul 11, 2012
@dblock dblock merged commit ca3f61e into Waffle:tomcat7 Jul 11, 2012
@dblock
Copy link
Collaborator

dblock commented Jul 11, 2012

Merged this, thank you. I want the update on the 1.5 branch too please.

@hazendaz
Copy link
Member Author

Thanks! I'll get this all updated on 1.5 branch as soon as I can. Probably later this week or at latest sometime this weekend. I had a few other things to update in the meantime...

Thanks,

Jeremy

-----Original Message-----
From: Daniel Doubrovkine (dB.) [mailto:[email protected]]
Sent: Tuesday, July 10, 2012 10:19 PM
To: hazendaz
Subject: Re: [waffle] Tomcat7 (#6)

Merged this, thank you. I want the update on the 1.5 branch too please.


Reply to this email directly or view it on GitHub:
#6 (comment)


No virus found in this message.
Checked by AVG - www.avg.com
Version: 2012.0.2195 / Virus Database: 2437/5124 - Release Date: 07/10/12

@dblock
Copy link
Collaborator

dblock commented Jul 11, 2012

Jeremy, can you please, please figure out how to preserve the line endings and not have giant changes of whitespaces for the next pull? I would start with Eclipse and making sure you're using defaults, then with Git that has options to update CR/LFs, it should be off. Practice on a throw-away branch of your own code. Thaanks :)

@hazendaz
Copy link
Member Author

Sure. I have tracked it down to github gui doing it on the confirm. I can see my original source is correct and diffs in github gui look correct. As soon as I commit it does this. I haven't found where those settings are yet in github. Ill look more in depth tonight. This issue is important. I'm trying to work other projects and having same issue. As soon as I figure it out would you like me to fix all the files currently messed up?

Sent from my Verizon Wireless Phone

--- Original Message ---

From: "Daniel Doubrovkine (dB.)" [email protected]
Sent: July 11, 2012 7/11/12
To: [email protected]
Subject: Re: [waffle] Tomcat7 (#6)

Jeremy, can you please, please figure out how to preserve the line endings and not have giant changes of whitespaces for the next pull? I would start with Eclipse and making sure you're using defaults, then with Git that has options to update CR/LFs, it should be off. Practice on a throw-away branch of your own code. Thaanks :)


Reply to this email directly or view it on GitHub:
#6 (comment)

@dblock
Copy link
Collaborator

dblock commented Jul 11, 2012

I wouldn't worry too much about the past, up to you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants