Age | Commit message (Collapse) | Author |
|
svn+ssh://svn/svn/linden/branches/Branch_1-18-6-Server -> release
|
|
svn merge -c 74225 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74273 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74366 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74424 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74444 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -r 74473:74631 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
Missed merge range in release r74199. Josh is an idiot.
|
|
svn+ssh://svn/svn/linden/branches/viewer-auth-server-2
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
Backport of fixes from production branch. Merge verified with QAR-41
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
Merge fixes applied directly to 1.18.3 for server deploy, through the sim rollout:
* Listen on the right port for the auditor, don't rely on catch-all
* Fix XMLRPC test object channel
* Various VAT fixes
* Make update_version_files more resilient
* Add class 502/510 for new datacenter
* Teleport metrics fixes
* DB schema update
|
|
into release. had to blow away the libraries directory to clear up svn evil.
|
|
* Tweak simulator_version script to slam all regions to the new version we're deploying
|
|
Tess and Leyla.
Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
|