Viewing all changes in revision 780.
- Committer: Peter Banka
- Date: 2011-03-02 20:10:45 UTC
- mfrom: (779.2.55 1.00)
- Revision ID: peter.banka@peacemaker-20110302201045-kblgewet2zq2kwa1
Merging a few months' worth of changes up
- files added:
- build/dpkg/server/bdr_admin.1
- client/tests/TestPackage-7
- client/tests/TestPackage-7/injector
- client/tests/TestPackage-7/scripts
- client/tests/repos
- client/tests/repos/injectors
- client/tests/repos/libs
- client/tests/repos/type4/TestPackage-7
- client/tests/repos/type4/TestPackage-7/injector
- client/tests/repos/type4/TestPackage-7/scripts
- server/lib/web/rest_api/configs/fixtures/repos/injectors
- server/lib/web/rest_api/configs/fixtures/repos/libs
- server/lib/web/rest_api/configs/fixtures/test_repos
- server/lib/web/rest_api/configs/fixtures/test_repos/conf
- server/lib/web/rest_api/configs/fixtures/test_repos/db
- server/lib/web/rest_api/configs/fixtures/test_repos/db/revprops
- server/lib/web/rest_api/configs/fixtures/test_repos/db/revprops/0
- server/lib/web/rest_api/configs/fixtures/test_repos/db/revs
- server/lib/web/rest_api/configs/fixtures/test_repos/db/revs/0
- server/lib/web/rest_api/configs/fixtures/test_repos/db/transactions
- server/lib/web/rest_api/configs/fixtures/test_repos/db/txn-protorevs
- server/lib/web/rest_api/configs/fixtures/test_repos/hooks
- server/lib/web/rest_api/configs/fixtures/test_repos/locks
- server/share
- files removed:
- client/tests/integrationTest.py
- files renamed:
- client/tests/packages/ => client/tests/repos/type4/
- server/scripts/bombardier_cnm => server/scripts/bdr_dispatcher
- server/lib/web/rest_api/templates/ => server/share/bdr-templates/
- files modified:
- .bzrignore
- server/share/bdr-templates/404.html *
- server/share/bdr-templates/500.html *
- server/share/bdr-templates/config_setting_form.html *
- server/share/bdr-templates/error.html *
- server/share/bdr-templates/registration/logged_out.html *
- server/share/bdr-templates/registration/login.html *
expand all
collapse all
added
removed
