datatracker/ready-for-merge
Henrik Levkowetz 15460b3cff Merged in [10718] from olau@iola.dk:
Set daemon = True on the thread in the SMTP test server running while
running tests. This fixes the annoying problem of the python process
staying alive after certain bugs in the test invocation or after a
plain Ctrl + c.
 - Legacy-Id: 10859
Note: SVN reference [10718] has been migrated to Git commit d67a96b4f0
2016-02-25 20:04:57 +00:00

65 lines
2.2 KiB
Plaintext

# By saying 'Commit ready for merge' in the commit message when you commit a
# change to your branch, the commit will be included in the merge list for the
# next release. However, if a commit for some reason haven't is missing that
# phrase in the commit comment, the branch and revision of the changeset can
# be added to this file in trunk/ by the merge master, and it will also be
# included in the merge list.
# --- Add entries at the top ---
/branch/iola/community-list-cleanup-r10639@10718
/personal/housley/v6.14.2.dev0@10834
/personal/housley/v6.8.1.dev0@10773
/personal/housley/v6.8.1.dev0@10772
/personal/housley/v6.8.1.dev0@10771
/personal/housley/v6.8.1.dev0@10770
/personal/rjs/v6.13.1.dev0@10757
/personal/rjs/v6.13.1.dev0@10731
/personal/rjs/v6.11.1.dev0@10701
# A whole bunch of ready commits not marked as such
/personal/lars/6.11.1.dev0@10621
/personal/lars/6.11.1.dev0@10616
/personal/lars/6.11.1.dev0@10615
/personal/lars/6.11.1.dev0@10614
/personal/lars/6.11.1.dev0@10605
/personal/housley/v6.8.1.dev0@10633
/personal/housley/v6.8.1.dev0@10632
/personal/housley/v6.8.1.dev0@10630
#
branch/iola/automatic-doc-name-search-r10126 @ 10158
branch/iola/docalias-primary-key-r10101 @ 10111
branch/amsl/liaisons/6.4.1 @ 10098
branch/iola/meeting-history-r9663 @ 9669
branch/iola/milestone-editing-bugfix-r9994 @ 9996
#personal/rjs/v6.0.2.dev0@9540:9542
#personal/lars/6.0.2.dev0@9526
personal/lars/6.0.2.dev0@9525
personal/lars/6.0.2.dev0@9524
personal/willem/v5.12.4.dev0@9316
branch/iola/facelift-r8876@8970 Test crawler speed-up
branch/iola/facelift-r8510@8733
personal/rcross/v5.7.3-dev0@8641
personal/suresh/v5.7.3-dev0@8602
personal/rjs/v5.6.3-dev0-session@8305
personal/rcross/v5.6.2-dev0@8216
branch/iola/people-cleanup@8297
branch/iola/team-support@8057
personal/fanpeng/v5.5.3-dev0@8005
branch/iola/team-support@7914
personal/rjs/v5.4.0@7644
branch/iola/djangoport-fixes@7416
branch/iola/djangoport-fixes@7421
branch/iola/djangoport-fixes@7519
personal/rcross/v5.1.0@7568
personal/rcross/v5.1.0@7549 Fix tests broken in auth change
personal/rcross/v5.1.0@7454
personal/rjs/v5.1.0-dajaxice-patch@7456
personal/rcross/v5.0.2@7398
personal/rcross/v5.0.2@7378
personal/jmh/v5.0.2@7375
personal/rjs/v4.90@7138 Was waiting for additional tests