AWIPS User
|
07cae6066d
|
NEXRAD KLGX Grays Harbor
Former-commit-id: 4a9fd54203
|
2015-09-07 13:31:05 -06:00 |
|
AWIPS User
|
db0d05f9f9
|
NPP menus, sat imagery rules, precip/MSLP bundle added
Former-commit-id: 046c6003a5 [formerly 1ba31c289f ] [formerly 94e415a0e594041a14edae8b60b5a86df9c89240 [formerly a5196fe357 ]]
Former-commit-id: 29fd9f06bcabd069aaa5483a19c97fbe6fdec938 [formerly 79b3407065 ]
Former-commit-id: 0633275b22
|
2015-07-03 09:16:24 -06:00 |
|
mjames-upc
|
5fbb381419
|
FNEXRAD menu config changes, labeling rule and colormap updates.
Former-commit-id: ac7ae413d6 [formerly ca188dd577 ] [formerly 6b86850d998657483ef8cce38bfa4163e72fa6c7 [formerly a5e9391e16 ]]
Former-commit-id: 51a6be2ce13b111b12a8ec1d4c6007df11276969 [formerly 749eef0c44 ]
Former-commit-id: d4eacc8497
|
2015-06-25 14:41:12 -06:00 |
|
AWIPS User
|
933f773bd3
|
FNEXRAD colormap updates and sat plugin style rule additions for labeling and scaling.
Former-commit-id: f2686ee818 [formerly 12671eeb72 ] [formerly 8649b7addd8eb1a89c378e6c9f62d6d27140ae0b [formerly 4fe8043de6 ]]
Former-commit-id: d4fda9d5ab85f0cba5a47539b0329c106488d457 [formerly 941abfbb43 ]
Former-commit-id: 698a833291
|
2015-06-24 20:31:12 -06:00 |
|
AWIPS User
|
f6df3bb55c
|
TDWR menu separate from NEXRAD sites
Former-commit-id: a2b9a1d78c [formerly b402f25eca ] [formerly 838f9a10ed9485a2332abf8360333c30a03c784b [formerly aa23b0afe0 ]]
Former-commit-id: 090bc56cb5b52d559971a30bff06a90b7e281107 [formerly fa78f4b8c6 ]
Former-commit-id: a1a9195e79
|
2015-04-22 17:28:24 -06:00 |
|
mjames-upc
|
d33cf5cbc8
|
Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: a2e6b5e6ed [formerly f71c396cef ] [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a [formerly 2288995260 ]]
Former-commit-id: 7a2ac36eca3df270f4afc658f6f3530848347ee4 [formerly cd4cb8eb1d ]
Former-commit-id: 93b22eeb17
|
2015-04-22 15:11:19 -06:00 |
|
AWIPS User
|
ea30abe01b
|
merge upc development orphan branch into upc_14.4.1
Former-commit-id: 4458299928 [formerly 06a7f2ad9d ] [formerly 1f4613a97ecb170f991ddd5ca9be32b5c63945b0 [formerly c9f28fd594 ]]
Former-commit-id: 76393e9e3ea8a386189eecfc4953a49d04ba95df [formerly 892c265b12 ]
Former-commit-id: 1ac670fc00
|
2015-03-01 12:44:45 -07:00 |
|
Ana Rivera
|
8ab81cc28a
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: ed61c52ee3 [formerly 4071b58b85 ] [formerly 8bfa7c4087 ] [formerly ed61c52ee3 [formerly 4071b58b85 ] [formerly 8bfa7c4087 ] [formerly 20ad0a65f3 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]]
Former-commit-id: 20ad0a65f3
Former-commit-id: f92cfb0f40 [formerly de74e8a90d ] [formerly 442a60d056ccadc0eef6f172e33926ab71037b10 [formerly 3696a3a1d1 ]]
Former-commit-id: dbb1d85007537eb63770397a06174c0f4b1b1206 [formerly 0af5d55eb6 ]
Former-commit-id: cf29758096
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
d87f6071d6
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: dd232580d0 [formerly 62094315d2 ] [formerly 7c5fc26537 ] [formerly dd232580d0 [formerly 62094315d2 ] [formerly 7c5fc26537 ] [formerly 327945af8b [formerly 7c5fc26537 [formerly 889608360567b829f81ed6392c64c669798f34a9]]]]
Former-commit-id: 327945af8b
Former-commit-id: 11426c1e60 [formerly a84f43a8c6 ] [formerly e41d85a493744309b4e1cd1f506bbd5cb6613c13 [formerly 5e97e24201 ]]
Former-commit-id: 89cb464614c3ae953a939f0b777e03f7ef4daf11 [formerly ef4ca10b8a ]
Former-commit-id: d4e36fe496
|
2015-01-27 16:28:42 +00:00 |
|
Steve Harris
|
936834331d
|
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: ea3465f55a [formerly 8cd9e2e92f ] [formerly 158fa16376 ] [formerly ea3465f55a [formerly 8cd9e2e92f ] [formerly 158fa16376 ] [formerly 0f05c53a53 [formerly 158fa16376 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]]
Former-commit-id: 0f05c53a53
Former-commit-id: c6bb3f9f17 [formerly 5fda208a17 ] [formerly fd646e3ab88985355fb86128bc69473ecf242072 [formerly 033d0fc742 ]]
Former-commit-id: 10bac022834ddaeda42626dd3c8c191014cda5e8 [formerly c3d3d5f424 ]
Former-commit-id: fcdd2faaf1
|
2015-01-23 09:08:06 -06:00 |
|
Nate Jensen
|
aa93629c1a
|
Omaha #3993 ensure important dataplugin utility folders are included in
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: 88e656a34d [formerly f88f62191f ] [formerly 05307be9d0 ] [formerly 88e656a34d [formerly f88f62191f ] [formerly 05307be9d0 ] [formerly b434ae1343 [formerly 05307be9d0 [formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]]]]
Former-commit-id: b434ae1343
Former-commit-id: 482a44faa4 [formerly 9df5c9249b ] [formerly cc869028254962519b3a37875e8c730e5b42e009 [formerly 39ab8668fa ]]
Former-commit-id: f298e0439354a644ee18ab4fd923ae39f704342c [formerly 69d8073d94 ]
Former-commit-id: 7a14b2de0c
|
2015-01-13 16:47:04 -06:00 |
|
mjames-upc
|
9fb01d9d75
|
modified code EDEX - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: a5f1222765
|
2015-01-12 14:07:45 -07:00 |
|
mjames-upc
|
886cd5940f
|
Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
|
2015-01-12 14:02:58 -07:00 |
|
Fay.Liang
|
bccf70f0bd
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 19a29da5de [formerly 6b77894bd0 ] [formerly c6bd5d7675 ] [formerly 19a29da5de [formerly 6b77894bd0 ] [formerly c6bd5d7675 ] [formerly eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]
Former-commit-id: eed6737801
Former-commit-id: 23ba9f4154 [formerly f3ecae8573 ] [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e [formerly 5cc8e5b4af ]]
Former-commit-id: cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e [formerly 06ac6b396e ]
Former-commit-id: 1e9024ede9
|
2015-01-12 13:03:31 -05:00 |
|
Daniel.Huffman
|
5f584808fb
|
ASM #632 -Filter erroneous RPG alert messages.
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e
Former-commit-id: f4ea480d38 [formerly 22f923eaf5 ] [formerly 9db291b296 ] [formerly f4ea480d38 [formerly 22f923eaf5 ] [formerly 9db291b296 ] [formerly 7a563dd505 [formerly 9db291b296 [formerly d7d3bc55053f16da410d3ebe1ef055e93d198790]]]]
Former-commit-id: 7a563dd505
Former-commit-id: 7b1fab2aea [formerly ccc9cf5662 ] [formerly 32744a5d8c21b6d50edd1fb162d0edab489546c7 [formerly c7b973493f ]]
Former-commit-id: b0612e200ebfb5c1f4da5f9ba71ba5ad87750add [formerly 93e0aad16e ]
Former-commit-id: 9b6f13244f
|
2015-01-07 00:41:35 +00:00 |
|
Nathan Bowler
|
f56a20c3c4
|
Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance.
Change-Id: I168bd135ae3ddd386761bb87b9160eb97f718642
Former-commit-id: 1f4c329495 [formerly f7acda4f6a ] [formerly 863ac95fef ] [formerly 1f4c329495 [formerly f7acda4f6a ] [formerly 863ac95fef ] [formerly a674630b92 [formerly 863ac95fef [formerly 6f9709b43d307494dfa702030b961964ec8d2170]]]]
Former-commit-id: a674630b92
Former-commit-id: a06f1ff4d8 [formerly 1548a93675 ] [formerly 27d5c1578378a059fb3484843a5cfb91f8286d9c [formerly c7805340b5 ]]
Former-commit-id: 3f7853f4280e7fccd785d4e7defa8fe1c534a560 [formerly 7f68dff20a ]
Former-commit-id: 77e1c83fbc
|
2014-12-19 12:56:43 -05:00 |
|
Ana Rivera
|
769df60be8
|
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 1f5dd0c92b [formerly 214be0a93b ] [formerly 043bc3a8b7 ] [formerly 1f5dd0c92b [formerly 214be0a93b ] [formerly 043bc3a8b7 ] [formerly 1823ed3596 [formerly 043bc3a8b7 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]]
Former-commit-id: 1823ed3596
Former-commit-id: 90efb445f0 [formerly ef35771bfa ] [formerly df1f34b8c00ffdaeec21c1d4b59bdc4ae9648cb2 [formerly d2d8127363 ]]
Former-commit-id: d7532e0824a0a0330656fbdab24737f609c2a10f [formerly f7c0319ee4 ]
Former-commit-id: 40df82b005
|
2014-12-16 23:39:02 +00:00 |
|
Zihou Wang
|
3ce375f5a2
|
VLab Issue #5571 - DR_17356 Remove extra sails tag; fixes #5571
Change-Id: Ic77c8413d7909fbd86bf6dbdcb58055be564a3f3
Former-commit-id: f666590cf8 [formerly a94ea04543 ] [formerly 0a4f817d28 ] [formerly f666590cf8 [formerly a94ea04543 ] [formerly 0a4f817d28 ] [formerly 42018056d9 [formerly 0a4f817d28 [formerly 5737eb25c9ac5ca56229c2379246051521c4a343]]]]
Former-commit-id: 42018056d9
Former-commit-id: 44460a937f [formerly 06750bb488 ] [formerly 337aec4c53975576058e309e0df518f9a2dc6095 [formerly 01ac0365ec ]]
Former-commit-id: abf17a8f0892a358c03ad5b89ea73313555b0185 [formerly 78ca98ce6c ]
Former-commit-id: c7b9f84bd6
|
2014-12-08 18:07:39 +00:00 |
|
Zihou Wang
|
a4c3bd511f
|
VLab Issue #5502 - DR_16767 Add hail size classes; fixes #5502
Change-Id: I7ed71f7cc7d14263bd233e289bd6b0c9febe140b
Former-commit-id: 407732dd66 [formerly 6977a174ac ] [formerly cbc28219f3 ] [formerly 407732dd66 [formerly 6977a174ac ] [formerly cbc28219f3 ] [formerly df4179f936 [formerly cbc28219f3 [formerly 249cd9b14341bc96a255fabe33abd44c8433e39d]]]]
Former-commit-id: df4179f936
Former-commit-id: d1d66c3eb2 [formerly fb612114f7 ] [formerly 509eb35e4621b7006bb9ed6a1ad3b80d6d237225 [formerly 8e574d2475 ]]
Former-commit-id: df65b9651434ba02ffe2abfb28d33c7dde8250a2 [formerly 6f82175e03 ]
Former-commit-id: b25eb58621
|
2014-12-03 16:24:55 +00:00 |
|
Zihou Wang
|
e9c3965738
|
VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d
Former-commit-id: 3ea0e0d218 [formerly 8d24be996a ] [formerly 4fe74892ea ] [formerly 3ea0e0d218 [formerly 8d24be996a ] [formerly 4fe74892ea ] [formerly 5c86a177b7 [formerly 4fe74892ea [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]]]]
Former-commit-id: 5c86a177b7
Former-commit-id: c754ac5448 [formerly 30be251dc9 ] [formerly 973f3734dffa4498dfb2ae9312c2b68cc51c9bcd [formerly d4ca49f01d ]]
Former-commit-id: e3714090e20a831caf11746053ae333eb208870b [formerly a47f4908e7 ]
Former-commit-id: de979397f4
|
2014-11-21 15:42:48 +00:00 |
|
Mark Peters
|
2be0b2985b
|
Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references
Change-Id: Ifb12010b4527c18b4e498b5de5757bb74634b496
Former-commit-id: fa37d9e21b [formerly 36ebe9468c ] [formerly a3725b43bc ] [formerly fa37d9e21b [formerly 36ebe9468c ] [formerly a3725b43bc ] [formerly 7ae2b9524b [formerly a3725b43bc [formerly fa93950435431248bd5790788e3a6936b4f4de2b]]]]
Former-commit-id: 7ae2b9524b
Former-commit-id: b930e70799 [formerly e6e0af04c3 ] [formerly 5041a32fb06c006c3e5d83db9ceb0c615557917d [formerly ee766624c5 ]]
Former-commit-id: 3ae6e3118b1d19fce53d78bc5f449232f5e9bdae [formerly 47410b9117 ]
Former-commit-id: 367f14a388
|
2014-11-13 13:34:42 -06:00 |
|
Mark Peters
|
4b5c6441f8
|
Omaha #3760 Moved derived parameters with radarVWP model to radar plugin
Change-Id: I57e6d8177eb483e14154b4bf0a1d86b71f40655f
Former-commit-id: f89b445636 [formerly abc4361a65 ] [formerly 9498a60e7b ] [formerly f89b445636 [formerly abc4361a65 ] [formerly 9498a60e7b ] [formerly 31701eeb9c [formerly 9498a60e7b [formerly e156d9527a0dd5fb25aca0264f1fddf546e60acf]]]]
Former-commit-id: 31701eeb9c
Former-commit-id: 3a7a308af2 [formerly 50ce1c6db6 ] [formerly fd716d7da9c0dbc8c709dcc157c96aa8dce61368 [formerly c1ca8b1301 ]]
Former-commit-id: d4141b189061e274afedc881a2b00f6978a08d4f [formerly 942daea6c7 ]
Former-commit-id: 47d615fdb4
|
2014-11-11 17:16:51 -06:00 |
|
Nathan Bowler
|
44ce1ac49e
|
Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories.
Change-Id: I472c2948ada9357350138fe27f2588cce27e17ba
Former-commit-id: a6ee027ada [formerly 74c41dc01f ] [formerly f714213db3 ] [formerly a6ee027ada [formerly 74c41dc01f ] [formerly f714213db3 ] [formerly 9673a96e71 [formerly f714213db3 [formerly 2ec9a420268e41d8fdc35efe7feabfb12b7bee4c]]]]
Former-commit-id: 9673a96e71
Former-commit-id: 14c889519c [formerly 0efd421fe8 ] [formerly 704328530d416ba52fb6f77fe45306f3415c3059 [formerly f76cd38a15 ]]
Former-commit-id: 1a3063ae33aace3d564ba182ce339f54014b6d08 [formerly 8c21dfa9a0 ]
Former-commit-id: 5fc502cf10
|
2014-10-30 13:18:14 -04:00 |
|
Ana Rivera
|
ad4a87da6e
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 147ea30ebb [formerly 69832d1fe3 ] [formerly 999c66b3e4 ] [formerly 147ea30ebb [formerly 69832d1fe3 ] [formerly 999c66b3e4 ] [formerly 86648e0a20 [formerly 999c66b3e4 [formerly 875c825320bdfb0e051b6d0ad2e530f7a7a16d19]]]]
Former-commit-id: 86648e0a20
Former-commit-id: 6c35db8d4d [formerly aa06e38595 ] [formerly 82e20f8fa6aa3851192c68860e5e7f1c90601c75 [formerly 0a2ecb9beb ]]
Former-commit-id: 12a6d9a20deebb092f64f070247578918326d56d [formerly 8770ba8303 ]
Former-commit-id: fc74bce6b8
|
2014-10-22 12:58:09 +00:00 |
|
Benjamin Phillippe
|
b4acac2eaa
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: af4f8e1c8a [formerly e6deeb6fb5 ] [formerly 7845e8e40f ] [formerly af4f8e1c8a [formerly e6deeb6fb5 ] [formerly 7845e8e40f ] [formerly fdd16051e8 [formerly 7845e8e40f [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]]
Former-commit-id: fdd16051e8
Former-commit-id: c77edf49f8 [formerly a8ef477042 ] [formerly d7e89f87bfd941634f6cb4c75072b070108267c4 [formerly 5eec33b078 ]]
Former-commit-id: 62bf8f62e268a6361913c3567879ca0d71e2b3ef [formerly 3808c125b9 ]
Former-commit-id: 008b23be1e
|
2014-10-20 12:42:19 -05:00 |
|
Ana Rivera
|
094d18d1ac
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I04cb8478a05b157e4acfc5f9ef02a9fd9186fe22
Former-commit-id: a96df6d6ad [formerly 0c11f99805 ] [formerly 796380dd53 ] [formerly a96df6d6ad [formerly 0c11f99805 ] [formerly 796380dd53 ] [formerly adfeb13067 [formerly 796380dd53 [formerly 56dc338129ed46612df4db1926e0b7e91551b60d]]]]
Former-commit-id: adfeb13067
Former-commit-id: 0371accc47 [formerly 60f9feed3e ] [formerly f6e448879003172c3aafecc16e87e7783e176970 [formerly 12c854e7cc ]]
Former-commit-id: f350b0f60c1e207b1fc2e10edfcd604fb4c9e1cb [formerly baf0eb6291 ]
Former-commit-id: cb21a22731
|
2014-09-30 19:59:19 +00:00 |
|
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 |
|
Steve Harris
|
b316e73f24
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
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/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: e3a7796362 [formerly da530db540 ] [formerly 091555cf10 ] [formerly e3a7796362 [formerly da530db540 ] [formerly 091555cf10 ] [formerly 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]
Former-commit-id: 4c56844e29
Former-commit-id: a1bf8ecdb1 [formerly 84a98ec4ca ] [formerly 275a024694cc566f868a949d844ab91490e424f6 [formerly 214b48dcb8 ]]
Former-commit-id: 9adb015794435a13e656ce09cd891bfd9e4d53db [formerly fdc523a026 ]
Former-commit-id: f4ea796cea
|
2014-09-19 10:28:57 -05:00 |
|
Brian.Dyke
|
845a9cb390
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 80f677e1e3 [formerly 1c0d6624a3 ] [formerly e1c88f287a ] [formerly 80f677e1e3 [formerly 1c0d6624a3 ] [formerly e1c88f287a ] [formerly 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]]
Former-commit-id: 57a361073d
Former-commit-id: bf6931a113 [formerly 47feda6450 ] [formerly 56e8b90c211d77cd58bb224d0ec60bd67aba968d [formerly 4476b9d19e ]]
Former-commit-id: ef186b2221b07e34cc32e9dc0106aff32d72736c [formerly 7e53a1d558 ]
Former-commit-id: c95be437eb
|
2014-09-17 15:50:13 -04:00 |
|
Brian.Dyke
|
74f3dd287f
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: d8271549ff [formerly fe85eb9f70 ] [formerly 3d9a3de6e4 ] [formerly d8271549ff [formerly fe85eb9f70 ] [formerly 3d9a3de6e4 ] [formerly 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 3319853886 [formerly 29364e2b9f ] [formerly 3c59646613e08582e0a259ecdec538060ca047c5 [formerly c42733eb39 ]]
Former-commit-id: 582e8cd843a57e8f4ac7a6572a5b3e23cd3b4f25 [formerly a31d3d702e ]
Former-commit-id: 0f9fe8301a
|
2014-09-09 11:44:30 -04:00 |
|
Ana Rivera
|
e57246c6ce
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: b03dd41331 [formerly e033ed5546 ] [formerly 160dabc4d1 ] [formerly b03dd41331 [formerly e033ed5546 ] [formerly 160dabc4d1 ] [formerly 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]]
Former-commit-id: 9af77831a6
Former-commit-id: ae4ea166aa [formerly 2045699212 ] [formerly 55222fba76e6458ccc65b959b86f2e7bff061cbc [formerly fbe4d57f6b ]]
Former-commit-id: f1c71d002deedd0c02aa5622f474ac29e9b2dd09 [formerly dee335f370 ]
Former-commit-id: aec8eba1a7
|
2014-08-28 18:38:26 +00:00 |
|
Nate Jensen
|
f6b45f075d
|
Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: c383a50c2c [formerly baece22d79 ] [formerly 58c85c76ef ] [formerly c383a50c2c [formerly baece22d79 ] [formerly 58c85c76ef ] [formerly 8f226399f7 [formerly 58c85c76ef [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]]
Former-commit-id: 8f226399f7
Former-commit-id: fcc794c395 [formerly 244395af69 ] [formerly 8fb5e2190df56d7947f5fa01937f377db2b2b918 [formerly 9843865254 ]]
Former-commit-id: 1078ebed9c14b2f160ab76ef1d6cb10d34c627c0 [formerly 2b829dc66b ]
Former-commit-id: fe0cd768ad
|
2014-08-28 11:46:25 -05:00 |
|
Baoyu Yin
|
fc24307837
|
VLab Issue #4554 - AWIPS2_DR_17469 Radar Digital Vertical Integrated Liquid wrongly capped at value of >60 kg*m^-2; fixes #4554
Change-Id: I78b45576bd2be9e3baa1f85da5a124de60842e3b
Former-commit-id: fd119c9495 [formerly 8e88237eab ] [formerly 2d3589e7af ] [formerly fd119c9495 [formerly 8e88237eab ] [formerly 2d3589e7af ] [formerly ebc018c7f6 [formerly 2d3589e7af [formerly 8d3b878a9c32b77e7bb19b087e7da8de492a4481]]]]
Former-commit-id: ebc018c7f6
Former-commit-id: 944f18e897 [formerly b400d2388c ] [formerly 66d7887dbafb1421f0e30773e722744f99804737 [formerly 81a3dadf58 ]]
Former-commit-id: 37617652e99d104a86124965c7b70320807cf5c0 [formerly 88d16f16fd ]
Former-commit-id: 41a0ef8b62
|
2014-08-28 09:50:26 -04:00 |
|
Nathan Bowler
|
d0df1e49ce
|
Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts.
Change-Id: Ie3ea761920c1ecec233e1fc586f3cbcd5914f1c6
Former-commit-id: 10f163ec37 [formerly f70776903c ] [formerly 2fcc25bb9b ] [formerly 10f163ec37 [formerly f70776903c ] [formerly 2fcc25bb9b ] [formerly 8fdc47855e [formerly 2fcc25bb9b [formerly 44ca6fb8a26cc9af7267ce635a200eb3c26ce9f8]]]]
Former-commit-id: 8fdc47855e
Former-commit-id: 7a50028eff [formerly b1fbb4e678 ] [formerly 774f44cab9d2b4fee8d681e9226c84c8f3a3bc47 [formerly f2be9c044e ]]
Former-commit-id: 68fbb736180cfea0a6a71068cb181a3ebac73827 [formerly d398fdca21 ]
Former-commit-id: d68602eadd
|
2014-08-21 10:55:28 -04:00 |
|
Zihou Wang
|
216f228716
|
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; fixes #3990
Change-Id: Ib6be85a3fb40649a093c8cd5d9278f324edb3a7f
Former-commit-id: 9f6cb88fb6 [formerly 3fa6a7840e ] [formerly bc1adc46c43d09dba76ceff4dda7b3486ba30667 [formerly 9b68bea7c3 ]] [formerly 9f6cb88fb6 [formerly 3fa6a7840e ] [formerly bc1adc46c43d09dba76ceff4dda7b3486ba30667 [formerly 9b68bea7c3 ]] [formerly 45d8572343 [formerly 9b68bea7c3 [formerly 3d305bffddf34d38b65176280e40709549f09ee5]]]]
Former-commit-id: 45d8572343
Former-commit-id: dc34f74979 [formerly c7cb18c58a ] [formerly 1e9537b22bfc30e8cad382d6481a37811bc21006 [formerly bf7d95c9b4 ]]
Former-commit-id: eb2c829581ed8d8f6c5f3c743c55c70877817511 [formerly 1339b41cb5 ]
Former-commit-id: 747c05ce39
|
2014-08-20 14:20:17 +00:00 |
|
Zihou Wang
|
a6e7bd5fae
|
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce
Former-commit-id: d71def2617 [formerly 2fd6278cf3 ] [formerly e9f78d8f52 ] [formerly d71def2617 [formerly 2fd6278cf3 ] [formerly e9f78d8f52 ] [formerly f54da5f6ae [formerly e9f78d8f52 [formerly f61e935c0372ee19768f2080da1f8fa21fb9aeb1]]]]
Former-commit-id: f54da5f6ae
Former-commit-id: d88eba846f [formerly cac176920d ] [formerly 8e188c48a6b64c228ad8f7ee3d55a6814a9e87a5 [formerly 065f2d9996 ]]
Former-commit-id: 27642fe140d1a84db5df0745cc1a89b25dfda084 [formerly 11e5523112 ]
Former-commit-id: e222fa4eda
|
2014-08-15 11:04:39 -05:00 |
|
Nate Jensen
|
f7ae70ac02
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: d61c65787b [formerly 253198b5bc ] [formerly b3083a663e ] [formerly d61c65787b [formerly 253198b5bc ] [formerly b3083a663e ] [formerly 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e7b11aaf88 [formerly 58a4cb95c1 ] [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14 [formerly d67083655a ]]
Former-commit-id: 7e191ad12969bca5c4c6b83a1e9488c58f4c6928 [formerly 951feab33d ]
Former-commit-id: 7336692b85
|
2014-08-14 10:22:37 -05:00 |
|
Brian Clements
|
51f49bd36d
|
Omaha #3503 common.serialization changes
moved adapters to new plugins
Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6
Former-commit-id: 81144aa9e2 [formerly 9c09de5779 ] [formerly 90d492c1dc ] [formerly 81144aa9e2 [formerly 9c09de5779 ] [formerly 90d492c1dc ] [formerly 415f2dff64 [formerly 90d492c1dc [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]]]
Former-commit-id: 415f2dff64
Former-commit-id: e61bbeab33 [formerly d6aae6eaeb ] [formerly 4bbada7b433206885b217a05943790769bea6e90 [formerly 0e415fd863 ]]
Former-commit-id: abe85f086aa74f360d31be08a09ecfa5ffe31308 [formerly 54742cff70 ]
Former-commit-id: b83ec9df6c
|
2014-08-08 12:50:06 -05:00 |
|
Nate Jensen
|
e56370bdbf
|
Omaha #3184 renamed valid identifiers to optional
Change-Id: I9653f9e00b3c693b46b516bc52ff029cd4fe1a81
Former-commit-id: 3a9c29fa88 [formerly 77d0661861 ] [formerly 3c1ae47a76 ] [formerly 3a9c29fa88 [formerly 77d0661861 ] [formerly 3c1ae47a76 ] [formerly 857179e08d [formerly 3c1ae47a76 [formerly d0e68c2fa1cc531263622410e4364b87f222139f]]]]
Former-commit-id: 857179e08d
Former-commit-id: b2826881d1 [formerly 79ae128758 ] [formerly 5f5ccd371d4bb68eebbd37f681f382e2a4178a4a [formerly f3ce06c00e ]]
Former-commit-id: f9519e138b50bf79c072fbfcdbbbe1e83b82f510 [formerly 90e35b4745 ]
Former-commit-id: f4dc5f03b6
|
2014-07-31 09:45:01 -05:00 |
|
Zihou Wang
|
c1cff8b205
|
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce
Former-commit-id: 0407d9da83 [formerly 5d614a78d1 ] [formerly ea54766486 ] [formerly 0407d9da83 [formerly 5d614a78d1 ] [formerly ea54766486 ] [formerly dc0c340094 [formerly ea54766486 [formerly f2c9fc4ba6e9c91dffb2c34b72b4a6b36e872571]]]]
Former-commit-id: dc0c340094
Former-commit-id: 01ec8386b8 [formerly 4dcf43f024 ] [formerly ada9aa0941b621c15d55be376b8762e3a686cd87 [formerly b8133858e7 ]]
Former-commit-id: ca7754314ff8a6d44d2d27717ab16c58b9f35ae7 [formerly 42b8872cb3 ]
Former-commit-id: b6f00bc118
|
2014-07-11 13:46:05 -04:00 |
|
mjames-upc
|
71c729d01a
|
added HHC colortable for UCAR NEXRCOMP gini product, added NEXRCOMP menu entries to D2D radar menu. added DefaultRadarComposite.xml template to to viz.radar localization. finally, changed Volume menu name to Models.
Former-commit-id: 69a7fa8a13
|
2014-06-25 17:02:35 -06:00 |
|
Nate Jensen
|
9afe98bf2b
|
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
Former-commit-id: af46dfd419 [formerly c9696dbd3b ] [formerly 791ab4913c ] [formerly af46dfd419 [formerly c9696dbd3b ] [formerly 791ab4913c ] [formerly 4bd68c8bd0 [formerly 791ab4913c [formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]]]]
Former-commit-id: 4bd68c8bd0
Former-commit-id: 05c81f432b [formerly 299c77f875 ] [formerly 8061c2ddd36f44e33ab8f0c40752fafbbbe7409b [formerly ce7812983a ]]
Former-commit-id: 98f991d11bbde4854fbbda437ae830942345566a [formerly 374fb4373e ]
Former-commit-id: 124d873714
|
2014-06-25 09:54:38 -05:00 |
|
Ben Steffensmeier
|
ac910bf48f
|
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 0a9e0932ce [formerly 08fe257daa ] [formerly e244664b7d ] [formerly 0a9e0932ce [formerly 08fe257daa ] [formerly e244664b7d ] [formerly 5c4f89644c [formerly e244664b7d [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]]]
Former-commit-id: 5c4f89644c
Former-commit-id: 216f6615df [formerly d52b2254f5 ] [formerly cdfe226fd4f2936b8857ca657cf932d134dc0f2f [formerly 4d22a3c58e ]]
Former-commit-id: 0238336c4ba4ce650a90647685bf7af41b2168f5 [formerly 397f83b2da ]
Former-commit-id: 8dbd523f44
|
2014-06-24 18:16:09 -05:00 |
|
Nate Jensen
|
f305e68ddb
|
Omaha #3311 fix storing UnlinkedContourVectorPacket
Change-Id: Iab87dbbcc2900ec781c881ca46bf23661fead2eb
Former-commit-id: 16d891abc5 [formerly af62c5950c ] [formerly e8beab36b6 ] [formerly 16d891abc5 [formerly af62c5950c ] [formerly e8beab36b6 ] [formerly d81fbb83ea [formerly e8beab36b6 [formerly 15a3026ccf38896b0858187c9e4d0e62a58c0336]]]]
Former-commit-id: d81fbb83ea
Former-commit-id: d779d91c2a [formerly db48912fc4 ] [formerly d23c14c0c641d83e668d834ff754f628da055dfa [formerly a4066337ec ]]
Former-commit-id: 85e46aa3f1ada7b334f46c0af3a56d773de9dd91 [formerly a0040bf8cc ]
Former-commit-id: da51903415
|
2014-06-24 15:53:11 -05:00 |
|
Ben Steffensmeier
|
f4319b5920
|
Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: 257cfe8bd3 [formerly a96199cc47 ] [formerly d838ecc734 ] [formerly 257cfe8bd3 [formerly a96199cc47 ] [formerly d838ecc734 ] [formerly 30415ae8c5 [formerly d838ecc734 [formerly b6c63e5791a2438253d6ff039b5164c61105a941]]]]
Former-commit-id: 30415ae8c5
Former-commit-id: 1210c094d7 [formerly 08a1e07918 ] [formerly c6abdf4a8300c5eb3d9c3950d871d79698655d9a [formerly eb7cf7e8da ]]
Former-commit-id: e02af9791372650c46525cb594c1dd112707a9c1 [formerly 02c4332c6a ]
Former-commit-id: 3db0af5561
|
2014-06-11 12:38:35 -05:00 |
|
Ben Steffensmeier
|
3f20ddf4e5
|
Omaha #3232 Add DynamicSerialize to radar hail prob packet.
Former-commit-id: 1599e7df77 [formerly aa0766584e ] [formerly 4240ad5c1b ] [formerly 1599e7df77 [formerly aa0766584e ] [formerly 4240ad5c1b ] [formerly 79cb8ebae8 [formerly 4240ad5c1b [formerly 713371e38842d3f8fd26f4df83d4b201611cd002]]]]
Former-commit-id: 79cb8ebae8
Former-commit-id: a8337629fb [formerly b480b2cec5 ] [formerly 3b2197a73fc71bf68652ff71a6d21b6a48a9f10e [formerly 5002a8a85e ]]
Former-commit-id: e500fbd5e7e80da310a2a5d585d7aaa39945b8d3 [formerly 73c7b9155c ]
Former-commit-id: b04b2658f4
|
2014-06-10 15:39:25 -05:00 |
|
Ben Steffensmeier
|
6dd09f3b8d
|
Omaha #3232 Radar code improvements.
Former-commit-id: d2587a7d57 [formerly 3eb6b79c56 ] [formerly 8587b9b43b ] [formerly d2587a7d57 [formerly 3eb6b79c56 ] [formerly 8587b9b43b ] [formerly 26325b57be [formerly 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]]
Former-commit-id: 26325b57be
Former-commit-id: cdd8eb2d9e [formerly 4f83edfa72 ] [formerly a96d770a2e60482e10653300e2065d1100acb73d [formerly b8fe181c9a ]]
Former-commit-id: fe8e7c1d08bafbe62409a3a17d56f49166d9b87c [formerly 9e97750df2 ]
Former-commit-id: dc5a927bb8
|
2014-06-05 14:53:25 -05:00 |
|
Ben Steffensmeier
|
20f928c30d
|
Omaha #2990 Fix radar mesocyclone regex.
Former-commit-id: 8b460b713d [formerly 5404dd5f83 ] [formerly c7c6c1b7ec ] [formerly 8b460b713d [formerly 5404dd5f83 ] [formerly c7c6c1b7ec ] [formerly cd6ba70787 [formerly c7c6c1b7ec [formerly 8e03f08f2d01f8b47101c09f950a0830cf8f0bb6]]]]
Former-commit-id: cd6ba70787
Former-commit-id: f457b3bc42 [formerly 757d792236 ] [formerly d67113feaaa5be7bbca1eaee950a4aff01b85d53 [formerly f669f3e22a ]]
Former-commit-id: 8a55366e8f6cbeda01c23d4cff927c90cfe83132 [formerly 5ffb664f27 ]
Former-commit-id: f1aaf45669
|
2014-05-28 16:40:35 -05:00 |
|
mjames-upc
|
b4c0da1971
|
first commit orphan branch from remotes/origin/ncep_14.2.1
Former-commit-id: 27eaf7aa70
|
2014-04-30 19:22:58 -06:00 |
|
Richard Peter
|
626ab0bd58
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
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.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.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.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87 ] [formerly 3575d6586f ] [formerly 9b12d9ddaf [formerly cd51f3fa87 ] [formerly 3575d6586f ] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404 ] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66 ]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54 ]
Former-commit-id: a22345ea6b
|
2014-04-11 16:23:09 -05:00 |
|