diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2008-11-27 02:48:08 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2008-11-27 02:48:08 +0500 |
| commit | ce81a26989d225926d3e713a264d95f1a53dd0b8 (patch) | |
| tree | 5169906e62a82ae88bc90eefa3f2670aa08c6c74 /pull_from_master.sh | |
| parent | 32d1450b6f627f87347cf44d36b3f337470046c9 (diff) | |
| download | prosody-ce81a26989d225926d3e713a264d95f1a53dd0b8.tar.gz prosody-ce81a26989d225926d3e713a264d95f1a53dd0b8.zip | |
Added options to limit the number of resources and for handling of resource conflicts
- core.max_resources: defaults to 10
- core.conflict_resolve: can be "random", "increment", "kick_new" and "kick_old" (default)
Diffstat (limited to 'pull_from_master.sh')
0 files changed, 0 insertions, 0 deletions