Opened 4 years ago

Closed 3 years ago

Last modified 3 years ago

#1802 closed Task (fixed)

New development branch for merging NOC 2016 developments

Reported by: acc Owned by: nemo
Priority: low Milestone: 2016 WP
Component: OCE Version: trunk
Severity: Keywords:
Cc: Review:
MP ready?:
Progress:

Description

Context

New branch to receive the merged developments from NOC for 2016

Implementation

Branches to be merged (in order):

2016/dev_r6381_SIMPLIF_5 (Smagorinsky)
2016/dev_r6393_NOC_WAD (Wetting and drying)
NERC/dev_r6998_ORCHESTRA (BDY and related changes only)

Finally bring upto trunk rev7161 ready for cross-centre merge

Commit History (4)

ChangesetAuthorTimeChangeLog
7342acc2016-11-25T17:17:41+01:00

Ticket #1802. Merged in changes from 6998:HEAD of NERC/dev_r6998_ORCHESTRA (BDY changes only). This branch already includes trunk changes up to rev 7161

7341acc2016-11-25T16:49:05+01:00

Ticket #1802. Merged in trunk changes from 6393:6998 and resolved single conflicit in cfg.txt

7339acc2016-11-25T16:40:32+01:00

Ticket #1802. Merged in trunk changes from 6381:6393 and then changes from branches/2016/dev_r6393_NOC_WAD

7338acc2016-11-25T16:27:45+01:00

Ticket #1802. Development branch for merging NOC 2016 developments

Change History (2)

comment:1 Changed 3 years ago by acc

  • Resolution set to fixed
  • Status changed from new to closed

Closed old development branch ticket.

comment:2 Changed 3 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.