tree f4e75e82b002f48dac15e6d4a58863b15f983713
parent 38b28bfe1fefab945fba1ebb2c3d8b38001ea358
author showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> 1263333588 +0000
committer showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> 1263333588 +0000

Merge the two databases and the two Django projects. Note that the TKO migrations are still present, as is the migration code for TKO in database/migrate.py. These pieces of code are preserved because they are required by this change to perform the merge. A separate change will be submitted in the future to remove those references.

WARNING: This change will move all tables in TKO into the AUTOTEST_WEB database. Custom TKO tables that Autotest does not know about will NOT be moved, and will be lost after this change. Any scripts that run directly against the TKO database will cease functioning until they are modified to run against AUTOTEST_WEB. Additionally, if you were importing any .py files from autotest_lib.new_tko.tko.*, they have been moved to autotest_lib.frontend.tko.*

Notes: You will need to manually create two files after applying this patch
touch <autotest_dir>/frontend/tko/__init__.py
touch <autotest_dir>/tko/migrations/__init__.py
Optionally, you can also remove the entire <autotest_dir>/new_tko/ directory, as it is no longer needed.

Signed-off-by: James Ren <jamesren@google.com>


git-svn-id: http://test.kernel.org/svn/autotest/trunk@4106 592f7852-d20e-0410-864c-8624ca9c26a4