Skip to content

Replaced all occurences of Charset.forName(UTF-8) with StringUtils.getPreferredCharset().#825

Merged
asfgit merged 1 commit intoapache:masterfrom
borisroman:charset
Sep 15, 2015
Merged

Replaced all occurences of Charset.forName(UTF-8) with StringUtils.getPreferredCharset().#825
asfgit merged 1 commit intoapache:masterfrom
borisroman:charset

Conversation

@borisroman
Copy link
Contributor

No description provided.

@wido
Copy link
Contributor

wido commented Sep 15, 2015

Pending travis LGTM

@borisroman
Copy link
Contributor Author

Travis failed due to a time-out.

@DaanHoogland
Copy link
Contributor

LGTM, thanks @borisroman

@asfgit asfgit merged commit 71929fd into apache:master Sep 15, 2015
asfgit pushed a commit that referenced this pull request Sep 15, 2015
Replaced all occurences of Charset.forName(UTF-8) with StringUtils.getPreferredCharset().

* pr/825:
  Replaced all occurences of Charset.forName(UTF-8) with StringUtils.getPreferredCharset().

Signed-off-by: Daan Hoogland <daan@onecht.net>
@borisroman borisroman deleted the charset branch September 15, 2015 11:42
@wilderrodrigues
Copy link
Contributor

@borisroman @wido

Was this PR compiled locally? Master is now broken. When I try to build I get:

BrocadeVcsApi.java:[378,26] error: cannot find symbol

I checked the file and found out the following:

import com.cloud.network.schema.interfacevlan.InterfaceVlan;
import com.cloud.network.schema.interfacevlan.Interface;
import com.cloud.network.schema.interfacevlan.Vlan;
import com.cloud.network.schema.portprofile.PortProfile;
import com.cloud.network.schema.portprofile.PortProfile.Activate;
import com.cloud.network.schema.portprofile.PortProfile.Static;
import com.cloud.network.schema.portprofile.PortProfileGlobal;
import com.cloud.network.schema.portprofile.VlanProfile;
import com.cloud.network.schema.portprofile.VlanProfile.Switchport;
import com.cloud.network.schema.portprofile.VlanProfile.Switchport.Mode;
import com.cloud.network.schema.portprofile.VlanProfile.Switchport.Trunk;
import com.cloud.network.schema.portprofile.VlanProfile.Switchport.Trunk.Allowed;
import com.cloud.network.schema.portprofile.VlanProfile.SwitchportBasic;
import com.cloud.network.schema.portprofile.VlanProfile.SwitchportBasic.Basic;
import com.cloud.network.schema.showvcs.Output;

import com.cloud.dc.Vlan;
import com.cloud.utils.StringUtils;
import com.cloud.utils.cisco.n1kv.vsm.PortProfile;

Which gives also this error:

PortProfile() is not public in PortProfile; cannot be accessed from outside package.

The imports are all wrong. Could you please fix it?

ping @remibergsma @miguelaferreira @DaanHoogland @karuturi @bhaisaab

Cheers,
Wilder

@remibergsma
Copy link
Contributor

@wilderrodrigues If something breaks master, any committer can revert it in order to restore stability. I didn't verify yet, but feel free to revert and ping the dev-list about it.

asfgit pushed a commit that referenced this pull request Sep 15, 2015
This reverts commit a44e2bf, reversing
changes made to 06cefaf.

We are reverting the PR #825 because it breaks Master.
@wilderrodrigues
Copy link
Contributor

Reverted by commit 6e426fa

@wilderrodrigues
Copy link
Contributor

Building is passing again:

[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 7:52.562s
[INFO] Finished at: Tue Sep 15 15:14:58 GMT 2015
[INFO] Final Memory: 91M/414M
[INFO] ------------------------------------------------------------------------
[root@cs1 cloudstack]#

yadvr pushed a commit to shapeblue/cloudstack that referenced this pull request Sep 16, 2015
This reverts commit a44e2bf, reversing
changes made to 06cefaf.

We are reverting the PR apache#825 because it breaks Master.
kishankavala pushed a commit to kishankavala/cloudstack that referenced this pull request Oct 15, 2015
This reverts commit a44e2bf, reversing
changes made to 06cefaf.

We are reverting the PR apache#825 because it breaks Master.
bvbharatk pushed a commit to bvbharatk/cloudstack that referenced this pull request Oct 19, 2015
This reverts commit a44e2bf, reversing
changes made to 06cefaf.

We are reverting the PR apache#825 because it breaks Master.
abhinandanprateek pushed a commit to shapeblue/cloudstack that referenced this pull request Oct 29, 2015
This reverts commit a44e2bf, reversing
changes made to 06cefaf.

We are reverting the PR apache#825 because it breaks Master.
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.

6 participants