Skip to content
Snippets Groups Projects
Commit 41122fe1 authored by Alexander van Amesfoort's avatar Alexander van Amesfoort
Browse files

Task #9939: merge trunk into this branch

Note that I'm unable to merge trunk changes merged into ResponsiveTelescope-9893 into this branch (svn limitation)
before merging this branch into ResponsiveTelescope-9893 (which I only want to do once I'm done, and now preferably via the trunk).

Solve merge conflicts on:
- LCS/MessageDaemons/src/MessageRouter.conf.ccu001
Revert my change to symlink to .ccu199.
Maintain my change to extend a rule in .ccu001 and .ccu199 (both files are now identical).
- momqueryservice.py: File moved while it was changed.
Maintain my change to add a 'return []' on connection failure. This is better than the default of returning None in this case.
Also replace unused loop idx 'i' by '_' in 2 places.
Note that the ResponsiveTelescope-9893 has more changes to this file. Part of the trunk has already been merged into there, so will need careful merge between the 2 sides later.
- RA assignment.py: radbrpc.updateTask() renamed its arg from status to task_status, so adjust to that.
Maintain all my changes. This also reduces the nr of occurances of status -> task_status to 1.
parents cce08aba 9b0c86ef
No related branches found
No related tags found
Loading
Showing
with 255 additions and 161 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment