Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

76991: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70109: ACE-1512: SOLR 4 - SSL and non-SSL Profiles
         - SSL works, and ssl ports are now configurable.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 11:58:39 +00:00
parent 68b0dca194
commit b7d76ac2e4
@@ -46,7 +46,7 @@
<configuration>
<excludes>
<!-- Excluding this test, because it requires the keystore which is a part of SystemBuildTest.
TODO: Consider moving this test into that project or making it pass on it own. -->
TODO: Consider moving this test into that project or making it pass on its own. -->
<exclude>**/SOLRAPIClientTest.java</exclude>
</excludes>
</configuration>