Steve Harris
|
d040b14742
|
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 d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 53d2822329 [formerly 98447412f8]
Former-commit-id: 7ee04eb560
|
2012-05-09 13:19:47 -05:00 |
|
David Gillingham
|
64df9d3b46
|
Issue #562: Rename QPFRecord getters and setters to match Java-naming
conventions, correct bugs in other classes found during test.
Change-Id: I7f490793678741ffa41769a63371e06d27840bdb
Former-commit-id: 6497272c1d [formerly c28bfaddee] [formerly 6497272c1d [formerly c28bfaddee] [formerly 292374ce21 [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]
Former-commit-id: 292374ce21
Former-commit-id: 1107eac65d [formerly 6f40ba77f1]
Former-commit-id: 01f74fa2b5
|
2012-04-27 12:43:04 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
f51d290333
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: c90ce9d54e [formerly ed26e06df2] [formerly c90ce9d54e [formerly ed26e06df2] [formerly fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]
Former-commit-id: fee53dea94
Former-commit-id: 51bb9ebb46 [formerly dcdd7f0648]
Former-commit-id: 58cb18d860
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
293563cfe7
|
12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32 [formerly ce3b74c605]
Former-commit-id: 2e0f4b241b
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
749ee2f4f4
|
Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 6d2af585b1 [formerly 5bbf80a384] [formerly 6d2af585b1 [formerly 5bbf80a384] [formerly 10dc140747 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]
Former-commit-id: 10dc140747
Former-commit-id: 7fc8cf3d94 [formerly 7bdde9f690]
Former-commit-id: a97a9f80c9
|
2012-03-12 13:10:34 -05:00 |
|
Steve Harris
|
9a09879521
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: 1ac6b36d1f [formerly 65b22abd24]
Former-commit-id: 895404abeb
|
2012-02-17 10:55:02 -06:00 |
|
mpduff
|
38d3969023
|
Issue #16 - data/manual now uses subdirectories
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb
Former-commit-id: 6b70dd6462 [formerly 59c8cbf1f3] [formerly 6b70dd6462 [formerly 59c8cbf1f3] [formerly 24efc2ee93 [formerly 3619411519db0fe5df90e47ca478f083931817ec]]]
Former-commit-id: 24efc2ee93
Former-commit-id: b1887fbdb8 [formerly 5deccb8bf5]
Former-commit-id: e66ce50272
|
2012-01-24 12:27:11 -06:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|