LPS-61306 Empty tab in Portal Settings > Authentication

[mikakoivisto]

No description provided.

[liferay-continuous-integration]

Some tests FAILED!

Build Time: 1 minute 20 seconds

Base Branch:

Branch Name: master
Branch GIT ID: 146d5a9c6214024448786ccab1d2fd52e8f2e926

Job Summary:

• test-portal-acceptance-pullrequest(master)
• test-portal-acceptance-pullrequest-source(master)

For more details click here.

---

Failed Jobs:

1. test-portal-acceptance-pullrequest(master)

   Job Results:

   0 Jobs Passed.
   2 Jobs Failed.

   Completed with the status of FAILURE.

2. test-portal-acceptance-pullrequest-source(master)

   Please fix rebase errors on mikakoivisto/pull-request-110-LPS-61306.

   
        [exec] First, rewinding head to replay your work on top of it...
        [exec] Applying: LPS-61306 Use comma only when company.settings.form.authentication contains section
        [exec] Using index info to reconstruct a base tree...
        [exec] M	modules/apps/portal-settings/portal-settings-web/src/main/resources/META-INF/resources/authentication.jsp
        [exec] Falling back to patching base and 3-way merge...
        [exec] Failed to merge in the changes.
        [exec] Failed to merge in the changes.
        [exec] Auto-merging modules/apps/portal-settings/portal-settings-web/src/main/resources/META-INF/resources/authentication.jsp
        [exec] CONFLICT (content): Merge conflict in modules/apps/portal-settings/portal-settings-web/src/main/resources/META-INF/resources/authentication.jsp
        [exec] Patch failed at 0001 LPS-61306 Use comma only when company.settings.form.authentication contains section
        [exec] The copy of the patch that failed is found in:
        [exec]    /opt/dev/projects/github/liferay-portal/.git/rebase-apply/patch
        [exec] 
        [exec] When you have resolved this problem, run "git rebase --continue".
        [exec] If you prefer to skip this patch, run "git rebase --skip" instead.
        [exec] To check out the original branch and stop rebasing, run "git rebase --abort".
        [exec] 
        [exec] commit 146d5a9c6214024448786ccab1d2fd52e8f2e926
        [exec] Author: Sergio Gonzalez <sergio.gonzalez@liferay.com>
        [exec] Date:   Mon Dec 14 23:53:06 2015 +0100
        [exec] 
        [exec]     LPS-61205 Fix compile error
        [exec] To git@github.com:brianchandotcom/liferay-portal.git
        [exec] To git@github.com:brianchandotcom/liferay-portal.git
        [exec]  \* [new branch]      master-temp-20151215023649524 -> master-temp-20151215023649524
        [exec]  \* [new branch]      master-temp-20151215023649524 -> master-temp-20151215023649524
      [delete] Deleting: /opt/dev/projects/github/liferay-portal/20151215023748711
   
   BUILD FAILED
   /opt/dev/projects/github/liferay-jenkins-ee/commands/build-test-portal-acceptance-pullrequest-source.xml:131: The following error occurred while executing this line:
   /opt/dev/projects/github/liferay-jenkins-ee/commands/build-test-portal-acceptance-pullrequest-source.xml:103: The following error occurred while executing this line:
   /opt/dev/projects/github/liferay-jenkins-ee/commands/build-common.xml:2389: Error on rebase of 'mikakoivisto/pull-request-110-LPS-61306' against 'master'.