7dd08303a3
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-19 00:56:59 +00:00
9754d265eb
EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
...
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
2007-12-06 18:18:35 +00:00
e5057b4747
svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
2007-11-21 02:29:23 +00:00
78aec043f3
svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-21 02:10:12 +00:00
138bf17c3c
merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-15 19:10:29 +00:00
1e7917fa89
Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://svn/svn/linden/branches/viewer-auth-server-2
2007-11-02 21:26:41 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
7ba0214179
export source now detects the prefix rather than assigning it based on filename. fixed up some comments to match our coding standard. added ability to set default license on export which will be useful for the next source drop. SL-56607
2007-10-02 23:42:54 +00:00
6981b3bc36
svn merge -r 69806:70964 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
2007-10-02 22:43:34 +00:00
5fa5307595
Run even if server version files are not present (e.g. if we share this outside LL with a viewer source drop). Also a little bit of variable renaming to clarify what's going on, and more verbosity when requested.
2007-09-26 17:56:33 +00:00
07c24d0437
Passed QA, merging minifriends-3:70006 back to release
2007-09-19 21:28:44 +00:00
b2595c369f
Merge sl-search-opt-in back into the release branch
...
Reviewed by Josh and Don
2007-08-30 22:11:52 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
3b2515fd5f
merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
...
Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
2007-08-10 02:15:37 +00:00
7769191414
Added much more error-recovery logic to template-verifier -- e.g. it retries a few times to fetch the master from the web. Also I changed the master to live in the system global tempdir, mostly because the build machines had a network problem and I wanted to reduce the chance of that happening. Not reviewed, but I'm checking it in over the weekend so I can silently fix it if there's yet another weird configuration difference that breaks it on the build machines.
2007-07-22 06:29:36 +00:00
dd6a0467ed
Fix parabuild breakage. Why the F is urllib opening an ftp connection to localhost? Not reviewed.
2007-07-20 22:10:59 +00:00
987d14fd46
SL-49406: template_verifier.py requires network access to build. Implemented a 4-hour cache so it hits the network less often overall (saving approx .5 seconds every build), and added fault tolerance for when it fails to fetch the master over the network. It'll whine at you if it can't fetch it, but even if it can't get the master from the network and doesn't have a cached copy at all, it will still at least do a syntax check on the local template.
2007-07-20 21:49:31 +00:00
168794a0f3
Replaced usage of urlopen.read(), which isn't guaranteed to return all of the downloaded bytes, with urlopen.readlines(), which (I believe) does have that guarantee. This should fix the rash of mysteriously-failing prebuilds. In the process, added some better error messaging about whether the local template has the parse error, or the master on the network. Also some reorganization. Reviewed by Tess and Leyla.
2007-07-19 01:09:12 +00:00
7964c6f7a5
Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
2007-07-16 20:29:28 +00:00
57b8fef824
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-07-11 21:29:02 +00:00
029130bf9c
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-23 21:17:34 +00:00
4ecb9cb63e
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
2007-05-01 21:39:25 +00:00
25f95cd08f
SL-38184 Make python scripts in linden/scripts run in place without PYTHONPATH or symlinks. Reviewed with Donovan.
2007-03-22 20:29:41 +00:00
934e15973e
merge release@57486 release-candidate@57503
2007-01-31 19:36:32 +00:00
71d28bdbf0
merge release@56803 release-candidate@56833
2007-01-17 23:02:00 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Jon Wolk