b3b62c3b9e
Fixed obvious typo, paired with rdw.
2007-10-08 22:40:47 +00:00
fbfd85165c
Little trick to further sweep SL-56900 under the rug. Not reviewed, I wish this were otherwise, but it needs to be committed to release so the osiris external can pick it up and I don't want to have to manually create /var/www/.python-eggs anymore.
2007-10-06 04:07:27 +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
9fc7049151
This should hide the problem in SL-56900. Reviewed by Donovan.
2007-10-03 23:20:12 +00:00
9763105427
Result of svn merge -r70716:70807 svn+ssh://svn/svn/linden/branches/open-py-libs into release.
2007-09-28 23:41:17 +00:00
910c792b00
svn merge -r70295:70503 svn+ssh://svn/svn/linden/branches/pylibs-freshen3
2007-09-26 14:41:36 +00:00
33ce57b485
Result of svn merge -r68268:69863 svn+ssh://svn/svn/linden/branches/entity-router into release.
2007-09-19 16:59:05 +00:00
80dfa222fd
Result of svn merge -r69150:69158 svn+ssh://svn/svn/linden/branches/named-queries-py3 into release.
2007-09-10 20:10:56 +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
b387b98bd0
Result of svn merge -r67150:67159 svn+ssh://svn/svn/linden/branches/mp-backbone-2 into release.
2007-08-02 19:05:10 +00:00
24c0e384fa
New mysql connection pool for Python, plus unit tests that verify that it's actually non-blocking. Some additional behavior in saranwrap, with tests that pass. Reviewd by Donovan.
2007-07-27 22:08:25 +00:00
9746cf5310
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
...
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
2007-07-26 01:22:23 +00:00
4284da1787
fix up copyrights on asset gc files
2007-07-25 22:44:05 +00:00
87955ce1eb
asset garbage collection scripts
2007-07-25 17:35:44 +00:00
ce7682c2a4
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
...
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
2007-07-18 21:22:40 +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
98740db8fd
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-04 19:49:24 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
James Cook