Implemented Federation Sets. Documentation.

4 files changed, 10 insertions, 4 deletions

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index cd2755a9..2f24298c 100644
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -30,6 +30,7 @@ This is something like svn-sync for gitblit.
 <br/>**New:** *federation.allowProposals = false*

 <br/>**New:** *federation.proposalsFolder = proposals*

 <br/>**New:** *federation.defaultFrequency = 60 mins*

+<br/>**New:** *federation.sets =*

 <br/>**New:** *mail.* settings for sending emails

 <br/>**New:** user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance

 - added: google-gson dependency

diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd
index 25c7d86f..37605c9a 100644
--- a/docs/01_setup.mkd
+++ b/docs/01_setup.mkd
@@ -132,6 +132,7 @@ All repository settings are stored within the repository `.git/config` file unde
 	    showReadme = false

 	    excludeFromFederation = false

 	    isFederated = false

+	    federationSets = 

 	    

 #### Repository Names

 Repository names must be unique and are CASE-SENSITIVE ON CASE-SENSITIVE FILESYSTEMS.  The name must be composed of letters, digits, or `/ _ - .`<br/>

diff --git a/docs/02_federation.mkd b/docs/02_federation.mkd
index 1eb1bbb8..b2df22e8 100644
--- a/docs/02_federation.mkd
+++ b/docs/02_federation.mkd
@@ -49,6 +49,9 @@ Individual Gitblit repository configurations such as *description* and *accessRe
 

 If *federation.passphrase* has a non-empty value, the federation tokens are displayed in the log file and are visible, to administrators, in the web ui.

 

+#### Federation Sets

+

+Federation Sets (*federation.sets*) are named groups of repositories.  The Federation Sets are available for selection in the repository settings page.  You can assign a repository to one or more sets and then distribute the token for the set.  This allows you to grant federation pull access to a subset of your available repositories.  Tokens for federation sets only grant pull access for the member repositories.

 

 ### Federation Proposals (Source Gitblit Instance)

 

@@ -177,7 +180,7 @@ By default, federated repositories can not be pushed to, they are read-only by t
 </tr>

 

 <tr><th>federation.N.frequency</th>

-<td>N [mins/hours/days]</td>

+<td>x [mins/hours/days]</td>

 <td>the period to wait between pull executions</td>

 </tr>

 

@@ -198,16 +201,16 @@ By default, federated repositories can not be pushed to, they are read-only by t
 

 <tr><th>federation.N.freeze</th>

 <td>boolean</td>

-<td>freeze the repository at the end of each pull</td>

+<td>freeze the repository after the first pull, subsequent pulls respect the local *isFrozen* setting</td>

 </tr>

 

 <tr><th>federation.N.include</th>

-<td>string array<br/>(space separated)</td>

+<td>string array<br/>(space-delimited)</td>

 <td>list of included repositories *(wildcard and fuzzy matching supported)*</td>

 </tr>

 

 <tr><th>federation.N.exclude</th>

-<td>string array<br/>(space separated)</td>

+<td>string array<br/>(space-delimited)</td>

 <td>list of excluded repositories *(wildcard and fuzzy matching supported)*</td>

 </tr>

 

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index e02be891..6eff75f1 100644
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -10,6 +10,7 @@ This is something like svn-sync for gitblit.
 <br/>**New:** *federation.allowProposals = false*

 <br/>**New:** *federation.proposalsFolder = proposals*

 <br/>**New:** *federation.defaultFrequency = 60 mins*

+<br/>**New:** *federation.sets =*

 <br/>**New:** *mail.* settings for sending emails

 <br/>**New:** user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance

 - added: google-gson dependency