James Korman
540435baa6
Issue #798 - Code review changes
...
Former-commit-id: f7a864a2c0
[formerly 14e68406b4
] [formerly 39a32d7c91
[formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]]
Former-commit-id: 39a32d7c91
Former-commit-id: 15af4ada93
2012-07-31 14:34:27 -05:00
James Korman
16643cb1bc
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 1166a7cbb1
[formerly 38a2e426d9
] [formerly 4cbbc59278
[formerly cb05a9f95384806537106dc804833331d6c7db48]]
Former-commit-id: 4cbbc59278
Former-commit-id: 5df52e38f9
2012-07-31 13:38:23 -05:00
Steve Harris
53d2822329
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: d7f7c26582
[formerly 092efd6072
] [formerly 31b3e87ffa
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
a2a6a18fae
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
David Gillingham
3e42bc7d2d
Issue #20 : Committing refactored archiver capability
...
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20 : Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: 535821e5b8
[formerly bb1ac9959b
] [formerly 061966f243
[formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]
Former-commit-id: 061966f243
Former-commit-id: 9f416558fa
2012-02-13 16:09:36 -06:00
David Gillingham
ea7a55ad8d
Issue #20 : Merge all changes from previous SVN repo to GIT.
...
Former-commit-id: b31f40ec9d
[formerly 845e6c19af
] [formerly b056e18757
[formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]
Former-commit-id: b056e18757
Former-commit-id: 87b15de88b
2012-01-26 17:38:43 -06:00
Matt Nash
82300ccdcf
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
8e80217e59
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00