Evgeniy Khramtsov
|
02cfb11a6d
|
Merge branch '2.1.x' into mergefix
Conflicts:
.gitignore
src/ejabberd.app
src/ejabberd_c2s.erl
src/ejabberd_captcha.erl
src/ejabberd_node_groups.erl
src/mod_caps.erl
src/web/ejabberd_http.erl
src/web/ejabberd_http_bind.erl
|
2010-12-14 23:10:08 +09:00 |
|
Badlop
|
0a59ebe405
|
Use pg2 from R14B in systems with older versions (EJAB-1349)
pg2_backport.erl is a copy of pg2.erl from Erlang/OTP R14B.
That module is used in ejabberd installations where an OTP
previous to R14 is installed.
|
2010-11-22 16:04:07 +01:00 |
|
Christophe Romain
|
628571f8cf
|
merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash
|
2010-07-13 12:04:30 +02:00 |
|
Badlop
|
7b76fdcde7
|
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
SVN Revision: 2891
|
2010-01-12 16:11:32 +00:00 |
|
Badlop
|
f09509502e
|
* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text
SVN Revision: 1804
|
2009-01-12 14:44:42 +00:00 |
|
Badlop
|
c3bda4aaee
|
* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708)
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise
SVN Revision: 1499
|
2008-07-31 11:18:49 +00:00 |
|
Badlop
|
2d2fcc8210
|
* doc/guide.tex: Updated copyright dates to 2008
* src/*: Likewise
SVN Revision: 1153
|
2008-01-15 17:02:57 +00:00 |
|
Mickaël Rémond
|
56fe3579bb
|
* Applied copyright update patch 1.
SVN Revision: 1110
|
2007-12-24 11:41:41 +00:00 |
|
Badlop
|
d625fc80fc
|
* src/acl.erl and other 64 files: Remove Erlang module attribute
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)
SVN Revision: 1044
|
2007-12-06 22:12:27 +00:00 |
|
Alexey Shchepin
|
091d2bcb00
|
* src/ejabberd_node_groups.erl: Support for node tagging
* src/ejabberd_sup.erl: Likewise
* src/ejabberd_frontend_socket.erl: Use node tags to determine
backend nodes
* src/ejabberd_config.erl: Added node_type and cluster_nodes
options
* src/ejabberd_app.erl: Establish connections to the nodes from
the cluster_nodes option
* src/ejabberd_router.erl: Added balancing method option
* src/ejabberd_config.erl: Likewise
SVN Revision: 676
|
2006-11-07 02:08:51 +00:00 |
|