Steve Harris
|
07c7b38a12
|
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: db4aa1cebe [formerly 2e2072a963] [formerly 7692e3f21d] [formerly db4aa1cebe [formerly 2e2072a963] [formerly 7692e3f21d] [formerly b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]]
Former-commit-id: b979960b7b
Former-commit-id: 4c7af33eee [formerly e5f8a8f74f] [formerly bb2bf4306deda494aadd9b7efdffeebf393b4e15 [formerly 50d6dccd09]]
Former-commit-id: 0542ccaca6c476485c13ff1fd290c8c34213e7a0 [formerly f831536854]
Former-commit-id: d3169a96b0
|
2014-09-23 11:41:10 -05:00 |
|
Brian.Dyke
|
a84a4182d1
|
VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
Former-commit-id: 5b36acf3d5 [formerly 9d2eaef5e7] [formerly 546b43dff6] [formerly 5b36acf3d5 [formerly 9d2eaef5e7] [formerly 546b43dff6] [formerly 05145d2f0d [formerly 546b43dff6 [formerly 0448deecda7c53ac65bc66bc9751ec0e7f83eee1]]]]
Former-commit-id: 05145d2f0d
Former-commit-id: 6aa73f47d1 [formerly 75284bdd1b] [formerly d9b47d26d3cd9aa014c6fb2c48603d7bf314e245 [formerly 60a61086d5]]
Former-commit-id: 33bb336064744904936fe8d28c6d356b02890596 [formerly 5516c71d4e]
Former-commit-id: 6f708b2b87
|
2014-09-17 15:39:57 -04:00 |
|
Chip Gobs
|
31e44a344d
|
Merge remote-tracking branch 'origin/master_14.3.1' into ohd_14.3.1_v6
Former-commit-id: fd21e46eb5 [formerly bc743b7bd7] [formerly 0278dfb45f] [formerly fd21e46eb5 [formerly bc743b7bd7] [formerly 0278dfb45f] [formerly 51f2d9df8e [formerly 0278dfb45f [formerly 2131a59fecbb9bc01dd395360f7f8dafe6d76b0b]]]]
Former-commit-id: 51f2d9df8e
Former-commit-id: 09a6d218ec [formerly ab57f9a631] [formerly 155218f05082dd882c81b85920d434ac6457113c [formerly 4ca70c7f7e]]
Former-commit-id: b665f74facb031ff4a4c84ab562fe45163cfa842 [formerly fba687dab4]
Former-commit-id: 589a94588d
|
2014-09-03 14:48:29 -04:00 |
|
Steve Harris
|
3c8bfc8160
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762 [formerly 66b485c000] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457]
Former-commit-id: ecf26b3ac5
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
2da6c7b93b
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
272905b186
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: e348a6abc7 [formerly c8e9153884] [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b [formerly 1839b614df]]
Former-commit-id: 85ccff40908964b07fef1c572de049c609434728 [formerly cd1b914f50]
Former-commit-id: 27372f098c
|
2014-08-22 14:16:22 -04:00 |
|
Slav Korolev
|
255c2b2b9e
|
Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761
This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly f4eec5a328 [formerly 55a1120bdb] [formerly dd9d117f90] [formerly f4eec5a328 [formerly 55a1120bdb] [formerly dd9d117f90] [formerly e5af41fa86 [formerly dd9d117f90 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]]].
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: 7c336276f4 [formerly 1c896cedab] [formerly a9bed4c6fd] [formerly 7c336276f4 [formerly 1c896cedab] [formerly a9bed4c6fd] [formerly a779c786f1 [formerly a9bed4c6fd [formerly aee044437492438381db98cc6fd3a917f6c05659]]]]
Former-commit-id: a779c786f1
Former-commit-id: 14193d9f0d [formerly d080af879e] [formerly 03e43cde864d9e501745b3af41e7db422c82dcbe [formerly 407be3d26f]]
Former-commit-id: 78f747829f22eb099862b93f26e70021a2f10294 [formerly 99a8258e86]
Former-commit-id: 9d0e31155f
|
2014-08-19 10:12:36 -05:00 |
|
Loubna.Bousaidi
|
54c46422a5
|
ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: 281f16d700 [formerly afae4700a6] [formerly 8c15d1f124] [formerly 281f16d700 [formerly afae4700a6] [formerly 8c15d1f124] [formerly d41e489ced [formerly 8c15d1f124 [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]]]
Former-commit-id: d41e489ced
Former-commit-id: ea83b54df2 [formerly d9be7127bc] [formerly e79b024b72366d3a4c5251b13e7896757aff0e52 [formerly 5cc9b08890]]
Former-commit-id: b4514916beb24de3adb110ccdeb429cb22202a70 [formerly 65cfa4e033]
Former-commit-id: af004872fd
|
2014-08-15 10:54:10 -05:00 |
|
Steve Harris
|
aa1af753b1
|
Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity."
This reverts commit 5a3f760b6f51d0561dd605388e6b025ebe70e330 [formerly 7ae3ca0bfc] [formerly 3f61ab53b2 [formerly 50e93daab7] [formerly 978349e517] [formerly 3f61ab53b2 [formerly 50e93daab7] [formerly 978349e517] [formerly 7ae3ca0bfc [formerly 978349e517 [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]]].
Former-commit-id: f4eec5a328 [formerly 55a1120bdb] [formerly dd9d117f90] [formerly f4eec5a328 [formerly 55a1120bdb] [formerly dd9d117f90] [formerly e5af41fa86 [formerly dd9d117f90 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]]
Former-commit-id: e5af41fa86
Former-commit-id: b046c4b4ad [formerly 8c5cbf7224] [formerly 2806a41b23fef93f82278dec46a34078c1150cdb [formerly 0739666ae9]]
Former-commit-id: 9d881e40fd73155c6378ecba1ce432d31d7fc5ad [formerly 9ce3fc1803]
Former-commit-id: 106e45a937
|
2014-08-12 10:19:12 -05:00 |
|
Slav Korolev
|
8cde8da9e2
|
Issue #2875 - Implemented HFR Surface Current Velocity.
Former-commit-id: 3f61ab53b2 [formerly 50e93daab7] [formerly 978349e517] [formerly 3f61ab53b2 [formerly 50e93daab7] [formerly 978349e517] [formerly 7ae3ca0bfc [formerly 978349e517 [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]]
Former-commit-id: 7ae3ca0bfc
Former-commit-id: 9d4c30c06d [formerly 4ef0572c2d] [formerly 7808ba4d1fc4778ef22c004cae26526a254433ee [formerly 14cf56ec46]]
Former-commit-id: a7d7e80cc38a3703e1840fbb233c45cedd89942a [formerly a3e480a756]
Former-commit-id: 3687b20fe7
|
2014-08-12 09:19:22 -04:00 |
|
Richard Peter
|
edd8eab06d
|
Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468
Former-commit-id: 1e6502af95 [formerly 01692edc6b] [formerly bd2d97dc46] [formerly 1e6502af95 [formerly 01692edc6b] [formerly bd2d97dc46] [formerly 8374869379 [formerly bd2d97dc46 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]]]
Former-commit-id: 8374869379
Former-commit-id: eb60541db3 [formerly fbb7094b60] [formerly 9a73fc5f58eae211e98112c3ab36c3b2a06bb1de [formerly e155de7bbc]]
Former-commit-id: e05c7dad4a8b16c419ffc3befd4bc04d56250181 [formerly 4e7687d442]
Former-commit-id: 24f06e6666
|
2014-08-06 10:57:31 -05:00 |
|
Steve Harris
|
8bce1903ec
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.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/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
Former-commit-id: d606269c5b [formerly a92dc418c6] [formerly 0fb743ec44] [formerly d606269c5b [formerly a92dc418c6] [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: 386dfebe65 [formerly b848e05aa1] [formerly af44a55101128b715bc6595cfc378e8fcdc2eb3d [formerly 46fe792d83]]
Former-commit-id: 5636830e013729a270565af661d066aa2f000390 [formerly 5e2f7a9f74]
Former-commit-id: a0fdc76880
|
2014-08-04 22:20:29 -05:00 |
|
Brian.Dyke
|
1d9494a502
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: b9da27608c [formerly bbe6ec4d50] [formerly 4f6e23e0fe3a5044b75abe6a89c965ab32b19947 [formerly 37aacfcb96]]
Former-commit-id: ea25ca2fdedff8bbe1c901d0538886147f633e65 [formerly b9daa26f7d]
Former-commit-id: 803ceadaec
|
2014-08-04 13:10:13 -04:00 |
|
Ying-Lian.Shi
|
752e386363
|
ASM #15649 - these 5 files are rolled back to 14.1.3
Change-Id: Ifc52168f1faf3984f2a2d72947273686c5a00fd9
Former-commit-id: a258d2fe22 [formerly 9dbfbbe0c3] [formerly 22d46f2658] [formerly a258d2fe22 [formerly 9dbfbbe0c3] [formerly 22d46f2658] [formerly 1f6d24a076 [formerly 22d46f2658 [formerly ab5a6807a591605e230d4180f1dcf3c2eaa8657f]]]]
Former-commit-id: 1f6d24a076
Former-commit-id: 6f4a17363f [formerly ef8ec0cff0] [formerly e7f2c77f7910b963761f0209e7ac972fc6adfa8d [formerly c571da3e89]]
Former-commit-id: c155f99f8b6ea5c68344fe29b4fd38a506591fb6 [formerly a0b7830856]
Former-commit-id: a1c024e575
|
2014-07-23 12:24:22 +00:00 |
|
Benjamin Phillippe
|
7b98ae2e01
|
Omaha #3379 Removing DWR
Former-commit-id: e613cb932e [formerly cc9e9b427a] [formerly d110e8428b] [formerly e613cb932e [formerly cc9e9b427a] [formerly d110e8428b] [formerly 4e1d93abf8 [formerly d110e8428b [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 63354789de [formerly 5eea012728] [formerly c20f089fcf16ae33c66408335723c47e9c63b082 [formerly 06e73cd55f]]
Former-commit-id: 9c31f8986bfae1d5ec15dea29bd1f66a4ab15fd7 [formerly 11a8186cbc]
Former-commit-id: 0c80abcc15
|
2014-07-11 11:56:44 -05:00 |
|
Greg Armendariz
|
c3bc9d54a0
|
Omaha #3299 - Remove project file and change build reference
Former-commit-id: c8dcf22c40 [formerly 20f5ccf9f0] [formerly f4063c8162] [formerly c8dcf22c40 [formerly 20f5ccf9f0] [formerly f4063c8162] [formerly 40ad6795df [formerly f4063c8162 [formerly c233ad285b9addca8a8be6074b1e2440896d2276]]]]
Former-commit-id: 40ad6795df
Former-commit-id: 4829515d8b [formerly 68846930ee] [formerly 59a419b15250da8d89339fae8df0b0dcea68d9f8 [formerly 44b448738c]]
Former-commit-id: f78f6ac73b275f66e33dc7bd717128b06fa613d6 [formerly d26bb8e2c2]
Former-commit-id: 941bc791a9
|
2014-06-30 14:49:24 -05:00 |
|
Chip Gobs
|
2e830c25ff
|
VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix.
Change-Id: I950192bc25dd1be78cf77e58f18946c86ac38623
Former-commit-id: 30d80c844b [formerly 382c7c4edd] [formerly 0e64ccc33a] [formerly 30d80c844b [formerly 382c7c4edd] [formerly 0e64ccc33a] [formerly 83a5ed0e92 [formerly 0e64ccc33a [formerly a948c8cc9ffdd19c26cee8c547984aec114e4221]]]]
Former-commit-id: 83a5ed0e92
Former-commit-id: cc219d4b8d [formerly eca77a2512] [formerly 7615e9787ae0bdf4f72c8426b657e8516cecabb9 [formerly 1ac4dce21d]]
Former-commit-id: fcdf2b862d91fc103720b20e002715f5f1d9251d [formerly 001d7a7796]
Former-commit-id: af54449116
|
2014-06-26 06:47:45 -04:00 |
|
Steve Harris
|
563cf7b455
|
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly e1c8ad2611 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 6cc0c35e76 [formerly d7cd0ac02c] [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a [formerly 362988b9d7]]
Former-commit-id: 54590884305d436b0bff6e041169417a3fab2fbb [formerly 8270fd8a9f]
Former-commit-id: a0d17947a9
|
2014-06-16 08:19:12 -05:00 |
|
Bryan Kowal
|
0d21df684d
|
Omaha #3189 - ensure the PostgreSQL libpq libraries are included in the hydroapps native directory
Former-commit-id: f716c82bce [formerly 1920bf461d] [formerly 03d2a8ab7e] [formerly f716c82bce [formerly 1920bf461d] [formerly 03d2a8ab7e] [formerly 8896dc8a75 [formerly 03d2a8ab7e [formerly 1da5e7cb5f6d8a6b8e915a8ecb238a0825991afe]]]]
Former-commit-id: 8896dc8a75
Former-commit-id: 4a8bafd06f [formerly 692673ade3] [formerly 72d1abfe8fc565c093665727697687b862180af2 [formerly 22d4631b55]]
Former-commit-id: 096ee29408ebba0fda45833935bf9bcf3daf63ed [formerly e237c659d0]
Former-commit-id: ccd09ebb95
|
2014-06-09 16:20:01 -05:00 |
|
Chip Gobs
|
c200d537cb
|
VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d
Former-commit-id: 12f78bef75 [formerly a5c4402f34] [formerly 83ac596f9e] [formerly 12f78bef75 [formerly a5c4402f34] [formerly 83ac596f9e] [formerly 036d1c4d31 [formerly 83ac596f9e [formerly 6944361d04e7462f768bb74f00780dc8b8a51225]]]]
Former-commit-id: 036d1c4d31
Former-commit-id: 1371c8a87c [formerly 8edb6c28d8] [formerly bb1f30981bdeb43668927256d57f49f733780101 [formerly 6fd88e5422]]
Former-commit-id: 2d45cc91f5762572b6eb6cac1728efefec011528 [formerly e9c140b3fc]
Former-commit-id: 5fa38e2acd
|
2014-06-05 13:37:02 -04:00 |
|
Steve Harris
|
cbd6f7c310
|
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 2b95865dec [formerly 647cd97e29] [formerly 7fec0d039c] [formerly 2b95865dec [formerly 647cd97e29] [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]]
Former-commit-id: 455eb8b39d
Former-commit-id: b1f34a5dd0 [formerly 373c816e6a] [formerly c52c0623361b5124ad656838a838096ff392d903 [formerly ec743199f1]]
Former-commit-id: 7d167287b3c5d094c77e241af01ad8945f4a9c0b [formerly cbceb4ea62]
Former-commit-id: 7eabeb7ad6
|
2014-06-02 11:21:46 -05:00 |
|
Brian.Dyke
|
408ecfa5c0
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]]
Former-commit-id: 3f1e12effc
Former-commit-id: c76d6df69d [formerly 3961c75ecd] [formerly 8ed2dc55683cd373c693766e728d2dbc5c2f9e63 [formerly 66aacd6578]]
Former-commit-id: 48941da01de7ecd361d967e7d76a018c85a27337 [formerly a23d371522]
Former-commit-id: 9351315fd6
|
2014-05-30 10:46:25 -04:00 |
|
Steve Harris
|
86d6a0cd4d
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3 [formerly 0e9d0b2ef5] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427]
Former-commit-id: 5fda99b1fe
|
2014-05-28 09:01:00 -05:00 |
|
Steve Harris
|
cf2950abdb
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
|
2014-05-27 14:48:24 -04:00 |
|
Bryan Kowal
|
9c40719094
|
Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version.
Rebased on re-compiled on the latest version of the nativeLib code.
Former-commit-id: d17ee734da [formerly 7341d90341] [formerly f1258ef865] [formerly d17ee734da [formerly 7341d90341] [formerly f1258ef865] [formerly c711ab9195 [formerly f1258ef865 [formerly b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a]]]]
Former-commit-id: c711ab9195
Former-commit-id: 8db253ebde [formerly 1e983fbf3f] [formerly d986cd8d506fff4caae3ec802642e727d2ac83a2 [formerly e387f50206]]
Former-commit-id: b917360ba99bb51f1513e722e0c039d5198e4b26 [formerly 3fd9da7e49]
Former-commit-id: cf8a8e4c6c
|
2014-05-27 13:16:37 -05:00 |
|
Steve Harris
|
3c9f653212
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: f79a449b6b [formerly 376482d3b1] [formerly 518822ed83] [formerly f79a449b6b [formerly 376482d3b1] [formerly 518822ed83] [formerly b6af2db9f5 [formerly 518822ed83 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]]
Former-commit-id: b6af2db9f5
Former-commit-id: 0fbeb1a165 [formerly 1dfc15a77e] [formerly 7d53b80294c5865df861c5b6db7d9a9380d06252 [formerly 14b1ea307f]]
Former-commit-id: 88f5f48abba58273dd5fee5505a2fe8efb91f86c [formerly d226dfb021]
Former-commit-id: e30dfd21ee
|
2014-05-22 14:31:06 -05:00 |
|
Bryan Kowal
|
f60d0ff125
|
Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version.
amend: remove debug code
Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3
Former-commit-id: 2ed7be0b50 [formerly 5ca6dfbf90] [formerly c6518e7378] [formerly 2ed7be0b50 [formerly 5ca6dfbf90] [formerly c6518e7378] [formerly 76cd1c2ac8 [formerly c6518e7378 [formerly 9ad4422eb9911f8fbf0c5db40103ee8a1d925570]]]]
Former-commit-id: 76cd1c2ac8
Former-commit-id: 3da0250e22 [formerly 5f438c4a08] [formerly 9cf4ec67daf3fedeef46142cce66d82caad1e57e [formerly b6baecf271]]
Former-commit-id: 73a756fd6e694288ee421a6adbbfc1c8c33563a4 [formerly 112cca8b8a]
Former-commit-id: 72c92e6571
|
2014-05-20 11:02:31 -05:00 |
|
brian.dyke
|
5c9495ee04
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: a2add51880 [formerly 2e105c1d5d] [formerly cba44a8343721392c8a010e859fb1efaca4b604b [formerly bc4649765a]]
Former-commit-id: 161c7365002f1434a02f072bc8ba71aba3cbf346 [formerly b42011fc76]
Former-commit-id: b2e3c50ec0
|
2014-05-19 09:45:37 -04:00 |
|
Mike Duff
|
8904d8a501
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly 6a67638a94 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]]
Former-commit-id: 6a67638a94
Former-commit-id: 3966697849 [formerly f49192936a] [formerly 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9 [formerly 70c8135fde]]
Former-commit-id: 79e94a80e7729225dba251b67e17c3517adc7fc5 [formerly 916d90ee64]
Former-commit-id: 4adf657556
|
2014-05-08 14:36:54 -05:00 |
|
Richard Peter
|
cbae8323b0
|
Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 1a2d875bd0 [formerly 2668f09447] [formerly 501980904d] [formerly 1a2d875bd0 [formerly 2668f09447] [formerly 501980904d] [formerly b091a8827a [formerly 501980904d [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]]]
Former-commit-id: b091a8827a
Former-commit-id: 6eb5a21ec6 [formerly 8f1b5b647d] [formerly bc0584123479bf5fdaccff51f63a759a58593715 [formerly d03c47719f]]
Former-commit-id: 4585aeb1c1c934aa634aa78cc7373e3e0048cbf4 [formerly 87c6348e61]
Former-commit-id: e555144511
|
2014-05-06 10:32:31 -05:00 |
|
Chip Gobs
|
172481a6aa
|
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: a95de2211a [formerly 4e4d00792d] [formerly 65d2135ac2] [formerly a95de2211a [formerly 4e4d00792d] [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 65d2135ac2 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]]
Former-commit-id: e42bef2a33
Former-commit-id: 5045e9fa66 [formerly c075175e8e] [formerly 3dc38f5850d9a6af32e30312873669ceb1e3ea3b [formerly 593b36d722]]
Former-commit-id: 77c9177d0a8eb55155050f750d97f90b20791bb0 [formerly 1b7f762617]
Former-commit-id: 47068a7939
|
2014-05-06 10:48:35 -04:00 |
|
Loubna.Bousaidi
|
a141c9fa13
|
ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: c064fb3ae4 [formerly 1b5bccc451] [formerly 760ee964d6] [formerly c064fb3ae4 [formerly 1b5bccc451] [formerly 760ee964d6] [formerly 6d526cb1ff [formerly 760ee964d6 [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 967156413e [formerly 93a6523f46] [formerly 51be7984ec7ff512df21cbd1bc4ce90ccce8b1b9 [formerly e28ec3469d]]
Former-commit-id: 88fa747f996318dc9368525454f7865cc4cee512 [formerly 84640a8936]
Former-commit-id: ecbad2efac
|
2014-04-29 21:09:34 +00:00 |
|
Steve Harris
|
64b4a6a719
|
Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 883244fa2e [formerly 29f4f53d27] [formerly a70710b467] [formerly 883244fa2e [formerly 29f4f53d27] [formerly a70710b467] [formerly 656ae897c1 [formerly a70710b467 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]]
Former-commit-id: 656ae897c1
Former-commit-id: 4cc478e83b [formerly b99ed0cce6] [formerly c89d11e09dd409255cf1e5daff026439aa00fab2 [formerly b1d31f21bc]]
Former-commit-id: 1efcd8cc307635929ab51dd088d4ae8d0cac33f0 [formerly 2d6dde4ac6]
Former-commit-id: d9af02b1d2
|
2014-03-26 16:19:26 -05:00 |
|
Brian.Dyke
|
dc35ed8fe1
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 6476c4fb85 [formerly 412a7eb2c2] [formerly 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]]
Former-commit-id: 8a69e5f0509d10278a9c81d31ec5d2e0a9d1f376 [formerly c19fc33493]
Former-commit-id: e7aea77979
|
2014-03-25 15:41:58 -04:00 |
|
Steve Harris
|
24c55c616c
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
|
2014-03-17 15:55:41 -05:00 |
|
Shawn.Hooper
|
aedaebcd97
|
ASM #377 - Baseline National River Location Database fails
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 94e4e3e649 [formerly 6a8a1c397b] [formerly 670da1895b] [formerly 94e4e3e649 [formerly 6a8a1c397b] [formerly 670da1895b] [formerly 85db05e819 [formerly 670da1895b [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]]]]
Former-commit-id: 85db05e819
Former-commit-id: d549088e33 [formerly b7cf50dd31] [formerly 32e11e96551b8e3081b3d4dde88e4590083e6392 [formerly 62a0c1dadf]]
Former-commit-id: b7f2c27096f052aab3c364f5bc82543098085d30 [formerly 6401571e92]
Former-commit-id: 94a008ff56
|
2014-03-07 13:12:11 -05:00 |
|
Brad Gonzales
|
e7295b16d2
|
Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly dea17a19da [formerly 0e3dc17872 [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]
Former-commit-id: dea17a19da
Former-commit-id: 09c083ce1f [formerly 4ba60d8a6f] [formerly f2869efb05c763771e03bc02057aa196d29b6d1a [formerly 78d35d4033]]
Former-commit-id: f70dd002a68a434eb5e81131bb0b82d4784e717e [formerly c4064160ec]
Former-commit-id: 4cbc3b1b05
|
2014-03-06 16:29:37 -06:00 |
|
David Gillingham
|
da665e15b0
|
Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 43733c77eb [formerly 607ce13c19] [formerly 32719432ff] [formerly 43733c77eb [formerly 607ce13c19] [formerly 32719432ff] [formerly de12904c7a [formerly 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]]
Former-commit-id: de12904c7a
Former-commit-id: b373d71852 [formerly a83191356d] [formerly d751bcbb04dc8d77626c940f99e5f7ad3f73874d [formerly 1520317c24]]
Former-commit-id: dccf95a720d831ceee3c0b64bcf95676cd281af5 [formerly 474dda75de]
Former-commit-id: 5911f4b2d4
|
2014-02-18 13:24:37 -06:00 |
|
Brian.Dyke
|
aab63d8758
|
Issue #179
Former-commit-id: ea0a5bebfd [formerly 6b3ebc4fef] [formerly a0626cdc00] [formerly ea0a5bebfd [formerly 6b3ebc4fef] [formerly a0626cdc00] [formerly b23c6f59f7 [formerly a0626cdc00 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]]]
Former-commit-id: b23c6f59f7
Former-commit-id: 9ec4a820d2 [formerly 2955d5c9f0] [formerly 8058c8a62e584fe650039e4e4c28cf04d7762dbc [formerly 6d58d8c016]]
Former-commit-id: b05a7a4faaca4fe7c20692df3b825b74112613e7 [formerly 5ac5774552]
Former-commit-id: cc4a735533
|
2014-02-04 16:53:34 -05:00 |
|
Ron Anderson
|
f33f5aec85
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.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/IFPGridDatabase.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/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f]
Former-commit-id: 77c132f706
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
e44faa7943
|
14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]]
Former-commit-id: d8e5799328
Former-commit-id: 188b12a1b0 [formerly 282d10fe6d] [formerly 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281]]
Former-commit-id: 86d049732a94fe967ea42eb6fadaec484ef0117f [formerly cd4a09623c]
Former-commit-id: 1ca553385c
|
2014-01-06 14:08:08 -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 |
|
Steve Harris
|
c01c05f777
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: b455a385e9 [formerly 1195e95c8b] [formerly b210ab8842ebdea3014e30e92d627d7f9a1742d7 [formerly 6539b80ded]]
Former-commit-id: b298b019250daf5a2e5c72bbc4f82d1267a2ad12 [formerly 2e47683d4a]
Former-commit-id: 6f4e8734c8
|
2013-12-02 16:17:38 -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 |
|
Brian Clements
|
53149f4869
|
Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: dc7ad4d465 [formerly 4c3453a657] [formerly aa24bc6fce] [formerly dc7ad4d465 [formerly 4c3453a657] [formerly aa24bc6fce] [formerly 5e7f2f0bdf [formerly aa24bc6fce [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: b7a10192f4 [formerly 90601f6ff8] [formerly a6c84a48a463eebfa267a1df2818691820f5dc81 [formerly 05b2a015cb]]
Former-commit-id: 3e6817554d34956823e10a116728dc64ba182b44 [formerly a8c2c5870c]
Former-commit-id: 9d3df8f842
|
2013-11-19 17:53:39 -06: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
|
1c4b82577c
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: b1d82b9c2c [formerly 156395b85b] [formerly 72d35279c7375fe7db3bdc163cd5fbd4a655ec1d [formerly d97edb20d1]]
Former-commit-id: 29c5be7d12e460b8d18f00420279fd45027d33c8 [formerly 7127a1e665]
Former-commit-id: c4e9fe1c94
|
2013-11-15 13:05:40 -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 |
|