James Korman
|
9d1df24a3d
|
Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 226ff6ea65 [formerly 1166a7cbb1 ] [formerly 38a2e426d9 ] [formerly 4cbbc59278 [formerly 38a2e426d9 [formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 6dc3f6ecbe7383c692d6eefe822b05fbf5ec6557 [formerly 5df52e38f9 ]
Former-commit-id: 16643cb1bc
|
2012-07-31 13:38:23 -05:00 |
|
Steve Harris
|
fe7ac96625
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990 [formerly d7f7c26582 ] [formerly 092efd6072 ] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8 ]
Former-commit-id: 53d2822329
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
98d8b3f188
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd ]
Former-commit-id: a2a6a18fae
|
2012-04-18 15:18:16 -05:00 |
|
David Gillingham
|
9a17298fb6
|
Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20: Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: a10e6766d8 [formerly 535821e5b8 ] [formerly bb1ac9959b ] [formerly 061966f243 [formerly bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]]
Former-commit-id: 061966f243
Former-commit-id: 4931a468f096c3bd0bb7f0820c5d10d1c1c224aa [formerly 9f416558fa ]
Former-commit-id: 3e42bc7d2d
|
2012-02-13 16:09:36 -06:00 |
|
David Gillingham
|
f2b58b2f16
|
Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 91ecb60c1f [formerly b31f40ec9d ] [formerly 845e6c19af ] [formerly b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]
Former-commit-id: b056e18757
Former-commit-id: 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b ]
Former-commit-id: ea7a55ad8d
|
2012-01-26 17:38:43 -06:00 |
|
Matt Nash
|
fa4cd88c90
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7 ] [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484 ]
Former-commit-id: 82300ccdcf
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9bb8decbcf
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f ]
Former-commit-id: 8e80217e59
|
2012-01-06 08:55:05 -06:00 |
|