Revision d977f86c
ID | d977f86cb08e084e4ffe004866e1ed522c387ae3 |
Parent | 59651d52, a8c1f633 |
Child | 71dc39a1 |
Merge branch 'stable-2.11' into master
- stable-2.11
Add query support for locks to luxid (cherry-pick)
Provide fields for lock queries (cherry-pick)
A quick fix for broken 'make distcheck'
- stable-2.9
Make gnt-debug locks display fake job locks properly
Make NiceSort treat integers well
Revision bump for 2.9.5
Set release date for 2.9.5
Add NEWS entry for 2.9.5
Conflicts:
src/Ganeti/Query/Locks.hs
src/Ganeti/Query/Query.hs
Conflicts were resolved in favor of master, where the code causing
the conflicts was cherry-picked from.
Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
Files
- added
- modified
- copied
- renamed
- deleted