Skip to content
Snippets Groups Projects
Commit 26ccbec1 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Renumber newly added flags to avoid a conflict in 19.05.

These conflict with JOB_MEM_SET/JOB_RESIZED in 19.05. Since 19.05rc1
has shipped - but no 18.08 maintenance releases have shipped with these
new flags - it is safer to renumber them here to avoid the merge conflict
going into 19.05.

Bug 6064.
parent bab13dfd
No related branches found
No related tags found
No related merge requests found
......@@ -1043,10 +1043,11 @@ enum ctx_keys {
#define JOB_WAS_RUNNING 0x00100000 /* Job was running */
#define RESET_ACCRUE_TIME 0x00200000 /* Reset the job's accrue time */
#define INVALID_DEPEND 0x00400000 /* Job has invalid dependency(ies). */
#define USE_DEFAULT_ACCT 0x00800000 /* Job submitted to default account */
#define USE_DEFAULT_PART 0x01000000 /* Job submitted to default partition */
#define USE_DEFAULT_QOS 0x02000000 /* Job submitted with default QOS */
#define USE_DEFAULT_WCKEY 0x04000000 /* Job submitted with default WCKEY */
/* GAP FOR TWO NEW 19.05 FLAGS */
#define USE_DEFAULT_ACCT 0x02000000 /* Job submitted to default account */
#define USE_DEFAULT_PART 0x04000000 /* Job submitted to default partition */
#define USE_DEFAULT_QOS 0x08000000 /* Job submitted with default QOS */
#define USE_DEFAULT_WCKEY 0x10000000 /* Job submitted with default WCKEY */
#define X11_FORWARD_ALL 0x0001 /* all nodes should setup forward */
#define X11_FORWARD_BATCH 0x0002 /* only the batch node */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment