Richard Peter
|
08d2290f97
|
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
|
2013-12-17 21:04:53 -06:00 |
|
Steve Harris
|
e242b041ad
|
14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890]
Former-commit-id: 800136d61b
|
2013-12-12 16:59:57 -05:00 |
|
Richard Peter
|
f362062048
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
|
2013-12-05 12:12:27 -06:00 |
|
Steve Harris
|
31c94115c7
|
14.1.1-12 baseline
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 1e4b2bac7b [formerly 4e6f319422] [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]]
Former-commit-id: e177b16a88af27dc0abf4496fe58fbe454cfa8c9 [formerly 234ca267ed]
Former-commit-id: 60f062ea59
|
2013-12-04 16:47:59 -05:00 |
|
Richard Peter
|
2e90e498f3
|
Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
nativeLib/edexBridge/edexBridge.cpp
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 7969ef9648 [formerly 760f215e8c] [formerly f5f75ec629] [formerly 7969ef9648 [formerly 760f215e8c] [formerly f5f75ec629] [formerly e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]]
Former-commit-id: e82e1137f9
Former-commit-id: 2cafd3a81b [formerly ee03dcf505] [formerly cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa]]
Former-commit-id: d636e539a84c2fe845b3dcfc419fff85a3a47055 [formerly b0e694483f]
Former-commit-id: 30862929e2
|
2013-12-03 16:25:31 -06:00 |
|
Steve Harris
|
941d5f65df
|
14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly 70a6f1936e] [formerly 401ee156b8 [formerly 337b138200] [formerly 70a6f1936e] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]]
Former-commit-id: 71ae71c850
Former-commit-id: 41a54a5ca6 [formerly 8bd818de09] [formerly 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]]
Former-commit-id: 163b900bd16bb48d13431ad4d1511ea0204fdfed [formerly f88a635a58]
Former-commit-id: bfa9d638cc
|
2013-12-02 17:10:10 -05:00 |
|
Steve Harris
|
c2c71e6bca
|
Issue #2297 - fixing build scripts
Former-commit-id: 35d141a1ce [formerly f5a4aa3fd8] [formerly 193f06f545] [formerly 35d141a1ce [formerly f5a4aa3fd8] [formerly 193f06f545] [formerly 94cd37acf6 [formerly 193f06f545 [formerly 3725a48cbdec19842d7c4e3facf737fc507e69dc]]]]
Former-commit-id: 94cd37acf6
Former-commit-id: 1ea87a31c1 [formerly 1914ddd079] [formerly 6f8066380ee7e58d7dbf970e1cf56bc481bf84f2 [formerly b0516c0938]]
Former-commit-id: 6679dd86e41a55daa6fb0bef55c854612c4d4dbd [formerly 5346faae3d]
Former-commit-id: f51f520acb
|
2013-12-02 14:57:20 -06:00 |
|
Steve Harris
|
8a1ea4d35f
|
14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]]
Former-commit-id: 9248695a1f
Former-commit-id: 2c49ed51ac [formerly e35ec60f7e] [formerly 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]]
Former-commit-id: 1da4cf492cf27e8f6e06f3cfbfcc4a4b3ce25255 [formerly 36d788890a]
Former-commit-id: ea65181d19
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
2d3311aace
|
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3b074763ab [formerly 3f9df61017] [formerly 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80]]
Former-commit-id: aff5d0abe267c4419bbecd159b29ef6d6ca51480 [formerly c26818afe6]
Former-commit-id: 87ce579deb
|
2013-11-15 13:15:25 -06:00 |
|
Steve Harris
|
e3de9e104e
|
14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 7977f24d77 [formerly eab5bb1147] [formerly 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d]]
Former-commit-id: 7d3151fa65482d7fe7a3ae91e52a20bb86097b97 [formerly ea382798b5]
Former-commit-id: ed58bc7f71
|
2013-11-15 12:47:49 -05:00 |
|
Richard Peter
|
d289419c40
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]
Former-commit-id: 0074b774f0
Former-commit-id: 625647a717 [formerly b4aac09ff4] [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41]]
Former-commit-id: 2067b058e879c394c330dccfc1994698c7f7cb05 [formerly e2a16fd876]
Former-commit-id: 705339a320
|
2013-11-14 14:40:23 -06:00 |
|
Bryan Kowal
|
89b9e26156
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 0544b66f4e [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]]
Former-commit-id: 0544b66f4e
Former-commit-id: ce40d40304 [formerly a2b1211c52] [formerly 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4]]
Former-commit-id: 52598106710ffd4583947f5428f98b7eb89170c3 [formerly 1a905e8a3c]
Former-commit-id: 97c0dff26a
|
2013-11-13 13:16:55 -06:00 |
|
Steve Harris
|
7facd4fe25
|
14.1.1-8 baseline
Former-commit-id: 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 1902ca9cfb [formerly b7ca6163e3] [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9]]
Former-commit-id: 299bb48cc93fac70de777c99a73fd516cc085238 [formerly 42ece4fb6a]
Former-commit-id: d2104614be
|
2013-11-13 12:32:17 -05:00 |
|
Bryan Kowal
|
6b9cae71e2
|
Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly d76033ff3d [formerly 7cac007ef1 [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]]]
Former-commit-id: d76033ff3d
Former-commit-id: d8a1e15951 [formerly e9ff5e018b] [formerly 08a3d0dc0c028b514f152d7d2df94af1610acc50 [formerly 084d772588]]
Former-commit-id: 5a7b66c6f75c115cad84c4d0aaf076e8a21ad3a3 [formerly 8867114ff8]
Former-commit-id: d83504922b
|
2013-11-12 17:43:10 -06:00 |
|
Richard Peter
|
ff729f46b5
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 112816a54c [formerly 3f68fc6eed] [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d]]
Former-commit-id: 8b93a7813019963981a150f64ec44daf5d188cde [formerly c8ef435295]
Former-commit-id: ef23a8f65b
|
2013-11-12 11:11:36 -06:00 |
|
Steve Harris
|
ec1c09b1f1
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 0ca3c86388 [formerly 9923b2c71a] [formerly b62ab264f0] [formerly 0ca3c86388 [formerly 9923b2c71a] [formerly b62ab264f0] [formerly 4190ddf39b [formerly b62ab264f0 [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]]]]
Former-commit-id: 4190ddf39b
Former-commit-id: 73966efbac [formerly 0822dd1682] [formerly 97466112f596932da4595e1e089695d5218ac848 [formerly 590d7de15d]]
Former-commit-id: 15faa0e793049cadddac2fa8f2a95f68cf78ae28 [formerly d4f5c58a4c]
Former-commit-id: d9479c586d
|
2013-11-11 11:40:03 -06:00 |
|
Steve Harris
|
7f35ae4d24
|
13.5.3-6 baseline
Former-commit-id: aa30ebfea8 [formerly 11ca17a63c] [formerly 77a45660d5] [formerly aa30ebfea8 [formerly 11ca17a63c] [formerly 77a45660d5] [formerly 5fa893d37b [formerly 77a45660d5 [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]]]
Former-commit-id: 5fa893d37b
Former-commit-id: 155831d8d2 [formerly 8705c4779b] [formerly 2ec2397f40dee7ff2d4d5b8e509eb1e661a33c78 [formerly f31112871c]]
Former-commit-id: a1911059fdce132548b02193b51b3d69bb6be40c [formerly 49b0919cf0]
Former-commit-id: 32ed33056b
|
2013-11-11 12:34:10 -05:00 |
|
Bryan Kowal
|
74664b1def
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cots/edu.uci.ics.crawler4j/.classpath
cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
cots/edu.uci.ics.crawler4j/build.properties
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GridToGribConverter.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1
Former-commit-id: f6b8d99e70 [formerly 3b8ce3fd34] [formerly c3eb4e9af9] [formerly f6b8d99e70 [formerly 3b8ce3fd34] [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c3eb4e9af9 [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: b2fb3cc71b [formerly 464a8d1001] [formerly 9832b7353c98edff371d73697564b1585403dd75 [formerly 1909193f0c]]
Former-commit-id: bbe6693bef01b8fb05627cf015f2b987c0a64c90 [formerly dfba50bf2e]
Former-commit-id: 9f749f3079
|
2013-11-08 14:51:47 -06:00 |
|
Steve Harris
|
0a1446c0ca
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 47778131b0 [formerly b93c4d7cd0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]]]
Former-commit-id: 47778131b0
Former-commit-id: c221d78097 [formerly 687b0848ee] [formerly 73554f8c6995705d78460251d3f25f87c8a32fbf [formerly 079a007217]]
Former-commit-id: d7860f8347a6475cb19459768957483d014d7ac4 [formerly bf0d783e52]
Former-commit-id: 0b0c0e247b
|
2013-11-07 11:32:42 -06:00 |
|
Steve Harris
|
f1688d58e6
|
13.5.3-5 baseline
Former-commit-id: 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly f175680b89 [formerly 06b5e0e0ec [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]]]
Former-commit-id: f175680b89
Former-commit-id: 3fac0e0b27 [formerly d9efe087e5] [formerly cae6925bd9b5a490e72c32e60a0c8c7f114e2386 [formerly 31b57882cb]]
Former-commit-id: 2004c192e88b30c3491b310a59ba776377cf312a [formerly b816e9e555]
Former-commit-id: e8e1307ee0
|
2013-11-07 12:22:32 -05:00 |
|
Steve Harris
|
2608595d90
|
14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6 [formerly b694612fe0] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed]
Former-commit-id: cfb3194426
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
24ec3c5993
|
14.1.1-6 baseline
Former-commit-id: f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]]
Former-commit-id: 6067af4252
Former-commit-id: 2a5f4c26d6 [formerly e86a0aa489] [formerly 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793]]
Former-commit-id: 30c24036c09dc21bf6f32deefe9a7a44f35d8005 [formerly 270c5f1a2d]
Former-commit-id: 0aa90a7855
|
2013-11-06 14:08:33 -05:00 |
|
Steve Harris
|
cff24d592c
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 0dd6732b0e [formerly 569ecb35d5] [formerly 3c862170db] [formerly 0dd6732b0e [formerly 569ecb35d5] [formerly 3c862170db] [formerly 18609de83d [formerly 3c862170db [formerly dbbf326f4fbfb3e07c97f6a7c380fa7e37544b72]]]]
Former-commit-id: 18609de83d
Former-commit-id: 29b6991e03 [formerly 7031baf4ef] [formerly 5a251bd0f0dbb41c6b3c857dc4057527e0a819bf [formerly 5f71d7795f]]
Former-commit-id: 13224d49fa710bcfabab8089ab1de4312bf209c0 [formerly da5e3ea0a9]
Former-commit-id: 4d1b869ee4
|
2013-11-01 13:23:28 -05:00 |
|
Steve Harris
|
c3ac33582f
|
13.5.3-4 baseline
Former-commit-id: 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly da7d1ce05e [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]]
Former-commit-id: da7d1ce05e
Former-commit-id: a4cc3f0bf6 [formerly 7454b37d59] [formerly 7369078223f22949c985fdf82f677dcb829640f5 [formerly b8d3fd62d0]]
Former-commit-id: 0df02f675ff87a29fb8942ecbcc9ef833301020e [formerly 8f9b121f90]
Former-commit-id: 90f27a16c9
|
2013-11-01 14:20:00 -04:00 |
|
Bryan Kowal
|
6a0ddf11e4
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
|
2013-10-31 15:34:46 -05:00 |
|
Steve Harris
|
f07e5b778e
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 855b444073 [formerly 2257eb5ddd [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]]
Former-commit-id: 855b444073
Former-commit-id: 23a1f33d89 [formerly c953a6574d] [formerly 2c8c708ed1c375e99805b56ce3ded641d901d6ca [formerly 83dc6d8e2a]]
Former-commit-id: bee869e597b8fb94bb5d2c695cae5fb58d860aab [formerly 60a5ddc88f]
Former-commit-id: 3f27e1cc23
|
2013-10-31 11:58:04 -05:00 |
|
Steve Harris
|
4d2a15c959
|
13.5.3-3 baseline
Former-commit-id: 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]]]
Former-commit-id: 1503847a4b
Former-commit-id: 3a5911368f [formerly a58b825dde] [formerly e27f6359a046d1d0047ec0fc1c24c9d171c5bf82 [formerly 6b879b2465]]
Former-commit-id: 00b390ce880010abcc3167a5427b564527ba940c [formerly 5be6e21405]
Former-commit-id: ef72863e6f
|
2013-10-31 12:52:07 -04:00 |
|
Bryan Kowal
|
feb28fd07f
|
Re-enable the build of the awips2 rpm.
Former-commit-id: bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly 326144970c [formerly 40e8a94235 [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]]]]
Former-commit-id: 326144970c
Former-commit-id: 8479f5a2a3 [formerly 897b7fbd27] [formerly 1c783532062ff1679c7f78199095439201056d75 [formerly 1c0a469975]]
Former-commit-id: 2e7c59ec7e88a1e173edadefda380988bb11ee5d [formerly 8bd4b5dd9a]
Former-commit-id: abe6b1151f
|
2013-10-30 15:24:01 -05:00 |
|
Steve Harris
|
071a47944f
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 0ab03f2796 [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]]
Former-commit-id: 83d2194a5a
Former-commit-id: eff76c3566 [formerly 771be074c0] [formerly f7cdd9e73c5d19a1d50e670a5eeceaa5bc626e90 [formerly 0efff318b8]]
Former-commit-id: a4fea6a1d532840bbb0cc77ad3e807e6be10e9b3 [formerly f5fc091e48]
Former-commit-id: 6da47cfbdd
|
2013-10-30 12:36:53 -05:00 |
|
Steve Harris
|
e979d6caa1
|
13.5.3-2 baseline
Former-commit-id: 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]]
Former-commit-id: 6d85d944a6
Former-commit-id: fef629ce26 [formerly 0c17777164] [formerly 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2]]
Former-commit-id: 33aa78b83a8657172de9ca0d0ef491a27006efe6 [formerly 1cc13c9992]
Former-commit-id: e90722d781
|
2013-10-30 12:53:25 -04:00 |
|
Steve Harris
|
179be1638a
|
Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]]
Former-commit-id: 972339d60f
Former-commit-id: dd533f0bce [formerly a444c93ee7] [formerly 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8]]
Former-commit-id: 9ec4de5036bebda97665c7c5c43fd0794ee9593d [formerly 0bf9020c49]
Former-commit-id: f49a22bae2
|
2013-10-28 14:39:22 -05:00 |
|
Steve Harris
|
6b1df92d87
|
14.1.1-5 baseline
Former-commit-id: 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly f4c53b02fa [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]]
Former-commit-id: f4c53b02fa
Former-commit-id: 7de3535d64 [formerly 3b738baba8] [formerly ba0194dff6dd3d0a89190211a15a136f32ca0270 [formerly af2707389c]]
Former-commit-id: 900d27f61f6ae40659280476bc184bfecf0849a7 [formerly 92851705fc]
Former-commit-id: 09eee9a31a
|
2013-10-28 12:14:27 -04:00 |
|
Steve Harris
|
cbf859daf6
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
c784003711
|
14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
|
2013-10-28 10:46:02 -04:00 |
|
Steve Harris
|
719dfc4763
|
13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2fbc08d837 [formerly 06f5dcf801] [formerly 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]]
Former-commit-id: be609d4b1adcd5effdcbb5631255d6839db62e54 [formerly 43610e510c]
Former-commit-id: 0e99e713e6
|
2013-10-28 10:30:57 -04:00 |
|
Steve Harris
|
fc9955c2e0
|
Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
Former-commit-id: 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 426b0662dc [formerly 6aab62b7b9] [formerly 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572]]
Former-commit-id: d8a3fc1a40537d39f3e081ace8795d06803bc0f7 [formerly 3a2a83bc4b]
Former-commit-id: 2864f20285
|
2013-10-25 10:51:42 -05:00 |
|
Steve Harris
|
e0d7e4cc22
|
13.5.2-13 baseline
Former-commit-id: e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]]
Former-commit-id: e7b1702032
Former-commit-id: a2442a8e39 [formerly 96c50ba394] [formerly 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b]]
Former-commit-id: 1340f052e588a7cd26a7455f448e5f92f5304a57 [formerly 6bff2d159f]
Former-commit-id: c71631dd28
|
2013-10-25 10:06:56 -04:00 |
|
Steve Harris
|
d1c823fe65
|
13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 2e6e031198 [formerly 15d9848170] [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]]
Former-commit-id: d6cb813e26904b36ed5b21ea7664539b21d552fa [formerly 248e79aa2f]
Former-commit-id: f97c128cc8
|
2013-10-25 09:59:15 -04:00 |
|
Steve Harris
|
4cfed2d3dd
|
13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]]
Former-commit-id: cbfde2f52a
Former-commit-id: a18eb8fe83 [formerly ecad06c80d] [formerly 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]]
Former-commit-id: b061ebe0205bf516b503d42df7cfdb9aacce9a06 [formerly 49b1168f5e]
Former-commit-id: d63a07d248
|
2013-10-25 09:45:58 -04:00 |
|
Bryan Kowal
|
fc1ac25dd2
|
Issue #2297 - fix 14.2.1 CAVE build.
Former-commit-id: 8514f712fe [formerly 476c19464d] [formerly 8b3f402dd8] [formerly 8514f712fe [formerly 476c19464d] [formerly 8b3f402dd8] [formerly de09a30a4d [formerly 8b3f402dd8 [formerly d71631f5cabae72a1ceb30f36ce574b2559c235d]]]]
Former-commit-id: de09a30a4d
Former-commit-id: 534db16695 [formerly b8d164bb71] [formerly 8ab460e815a19bf685445346eb309cab37331493 [formerly 3eeefe9e56]]
Former-commit-id: b111380874f008f7cb0bdfbcb45e874f1d6920d3 [formerly c7a890d8c2]
Former-commit-id: ab3041ff05
|
2013-10-15 16:07:23 -05:00 |
|
Bryan Kowal
|
d6d7b8d2ac
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly 542f5f2349 [formerly aa4ea792c1 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]]
Former-commit-id: 542f5f2349
Former-commit-id: 3534686eb5 [formerly de61382dc7] [formerly 518cc2598c60d171ae83c427ee2062c4d7ef8025 [formerly 5d5ccb7599]]
Former-commit-id: 0c291efdbf84e5f8baf1abb4fbbc4e083a99112e [formerly 86f7af5968]
Former-commit-id: 93dbbc2321
|
2013-10-08 14:44:38 -05:00 |
|
Bryan Kowal
|
537228e934
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 80c2ccd547 [formerly 96c800f3f4] [formerly 5eba3290c8] [formerly 80c2ccd547 [formerly 96c800f3f4] [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly 5eba3290c8 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]]
Former-commit-id: 8f14318bc7
Former-commit-id: ef0e6ede56 [formerly 72ed6c5f7a] [formerly d3917f8d40a980b637b27fc44df2b93eff0d5796 [formerly 53af4c7284]]
Former-commit-id: 7f36b6b414d057a6775afb670b148d983edab252 [formerly 5477a06781]
Former-commit-id: b8c2ece19c
|
2013-10-08 10:35:03 -05:00 |
|
Richard Peter
|
3f32cc7a8b
|
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]]
Former-commit-id: d9eae3ea28
Former-commit-id: af9c4be87a [formerly 94d0913bd9] [formerly ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]]
Former-commit-id: 4e8e2fc0d4cdef4da801ac692b1793e0b0aadafc [formerly 33b4f0c247]
Former-commit-id: d321c61259
|
2013-10-08 09:45:27 -05:00 |
|
Steve Harris
|
90889f8aa3
|
13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96 [formerly 21b84f0290] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7]
Former-commit-id: e1f7463a41
|
2013-10-04 11:30:03 -04:00 |
|
Bryan Kowal
|
ef1e7311a0
|
Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: f092ee3d76 [formerly efd377f12f] [formerly 61527c0b80] [formerly f092ee3d76 [formerly efd377f12f] [formerly 61527c0b80] [formerly 87087a5ea4 [formerly 61527c0b80 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]]
Former-commit-id: 87087a5ea4
Former-commit-id: c5df92f4eb [formerly af4b729522] [formerly b91956819bff7666a317ceb10eb717ae268cbcff [formerly fe4e9ca3f8]]
Former-commit-id: 67768811b42e628c1bd76006584ee4a3345d538e [formerly 297ee050ca]
Former-commit-id: a249b45111
|
2013-10-02 18:41:11 -05:00 |
|
Steve Harris
|
995b29e33c
|
Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/python.site-packages/Installer.qpid/component.spec
kept the omaha_14.1.1 versions of the .so files
Former-commit-id: 42cf95b398 [formerly 59f753ee0d] [formerly fc0cdf4996] [formerly 42cf95b398 [formerly 59f753ee0d] [formerly fc0cdf4996] [formerly 84ad96f2e0 [formerly fc0cdf4996 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: 7fbcfe7e31 [formerly c2fa80310e] [formerly fdd4df5abe5cb73e831f675a386f04a37e52c5b9 [formerly c6a4241c5b]]
Former-commit-id: 88d1ef7b773b7f227f1e41ee678ac1173e134ee6 [formerly 9aa19b42b5]
Former-commit-id: 160a5819f9
|
2013-10-01 15:34:01 -05:00 |
|
Bryan Kowal
|
87750ddaef
|
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 9829477ced [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]
Former-commit-id: 9829477ced
Former-commit-id: f7009e8d15 [formerly 0f825df590] [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730 [formerly ef789bf912]]
Former-commit-id: 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531 [formerly 0efd4c7c50]
Former-commit-id: 7bd9ea3d30
|
2013-09-30 18:00:31 -05:00 |
|
Richard Peter
|
468ef4815e
|
Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
Former-commit-id: fb9a34e22a [formerly 4b934caa41] [formerly 92a45d77bb] [formerly fb9a34e22a [formerly 4b934caa41] [formerly 92a45d77bb] [formerly 271a8d753e [formerly 92a45d77bb [formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]]]
Former-commit-id: 271a8d753e
Former-commit-id: 18268737b4 [formerly f23ea6e3ad] [formerly ad0c7e3be1948e8e01580b87275262dcbd92b650 [formerly 83dc5197a1]]
Former-commit-id: 67070831ebbb7c757e283b249d2ba402f461a1ef [formerly a00ad51154]
Former-commit-id: 57d31708f7
|
2013-09-24 12:29:16 -05:00 |
|
Steve Harris
|
6e9e71c2c6
|
13.5.2-6 baseline
Former-commit-id: 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3837fbe670 [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]]
Former-commit-id: 3837fbe670
Former-commit-id: 4f4af06329 [formerly 557a7c87d5] [formerly 3c4113cbd9b34d856c9d3a2aa3b0c92346ba75b4 [formerly 22cb9b98cd]]
Former-commit-id: 5d26a3bd0b975f9318873a838bde4603b2acc0b7 [formerly f91cf37d43]
Former-commit-id: b7b8d4a0b7
|
2013-09-23 10:03:15 -04:00 |
|
Steve Harris
|
3a21a9eb6c
|
13.5.2-4 baseline
Former-commit-id: 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]
Former-commit-id: 58c6821427
Former-commit-id: a8201afb82 [formerly 4c6790f10f] [formerly 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59]]
Former-commit-id: d4668ee6901a6bb072be3a88eaad320aed699c0f [formerly e2398f74e5]
Former-commit-id: 609926f1f4
|
2013-09-12 11:13:59 -04:00 |
|