mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.2 to HEAD
15471: MOB-279: Heartbeat now uses destination URL embedded in the license (if present) and also sends the following new parameters - memFree - memMax - memTotal - numUsers (this was there already) - numGroups - repoName 15349: Merged V3.1 to V3.2 15348: Fix ImportTest following fix to ETHREEOH-2219 15344: Merged V3.1 to V3.2 15339: ETHREEOH-2219: Give ImporterBootstrap its own retrying transaction helper with specific parameters tuned to its longer-running setup transaction. Should avoid startup errors on clustered installations. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
@@ -18,7 +18,7 @@
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
@@ -90,4 +90,11 @@ public interface LicenseDescriptor
|
||||
* @return <code>true</code> if this license allow the heartbeat to be disabled
|
||||
*/
|
||||
public boolean isHeartBeatDisabled();
|
||||
|
||||
/**
|
||||
* Gets an alternative URL that the heart beat should post data to, or <code>null</code> if the default URL is to be used.
|
||||
*
|
||||
* @return a URL or <code>null</code>
|
||||
*/
|
||||
public String getHeartBeatUrl();
|
||||
}
|
||||
|
Reference in New Issue
Block a user