mjames-upc
|
bf687306d0
|
RequiredExecutionEnvironment: JavaSE-1.7
Former-commit-id: 5b6bc2ace8
|
2016-02-03 21:45:47 -06:00 |
|
mjames-upc
|
dcd896c04e
|
adding back volumeScanNumber to radar plugins
Former-commit-id: 4091c791db
|
2016-01-04 15:00:58 -07:00 |
|
mjames-upc
|
e7f9d94158
|
bump to 4 radar decoder threads again
Former-commit-id: 1a9b07c48d
|
2016-01-04 11:47:43 -07:00 |
|
mjames-upc
|
5ec870d7b3
|
binlightning key location should be /awips2/ldm; muting RadarRecord volumescannumber for now
Former-commit-id: f2159e6617
|
2016-01-03 12:54:37 -07:00 |
|
mjames-upc
|
3a59fefb09
|
cleaning up unidata_15.1.1 enough to launch in eclipse
Former-commit-id: 0b01029e68
|
2015-12-29 20:15:31 -07:00 |
|
mjames-upc
|
ee0ab984ef
|
full set base level radarsInUse.txt
Former-commit-id: 2fc83a180b
Former-commit-id: 245f23b260
|
2015-11-05 14:39:41 -07:00 |
|
AWIPS User
|
d619eb74a2
|
sat and radar menu organization
Former-commit-id: ea2729b8d4 [formerly affd4212ed] [formerly 698c0b5166] [formerly 2b0c20177d193699d51d49a8fe1e0b22057117c0 [formerly 8f8b9dd16ea8ae10522f0f5092dcc20a9676444f] [formerly 698c0b5166 [formerly 0943c3edd5]]]
Former-commit-id: c2658d1e39033b56f602a9ebe312abcdfea4f307 [formerly fe06833d7f0b88c2fd77bec7b274dfbdaa6ab9cd] [formerly d3b35a2e3a [formerly 4c91c17326]]
Former-commit-id: d3b35a2e3a
Former-commit-id: 1c682e0af1
|
2015-07-22 10:31:01 -06:00 |
|
mjames-upc
|
03a42d911f
|
radar decoder threads increased to 4
Former-commit-id: dca8dab2dd [formerly 7e472929dd] [formerly c565061e4c] [formerly 50332078e59b895525193cd4e153f819b4025544 [formerly 4f55e5877214b5c73394abcdc0d98bdfd16806c1] [formerly c565061e4c [formerly 9b0adeadea]]]
Former-commit-id: 74a3b969f6b290d33873d7779893055ab32f025e [formerly 6064982345be766500cb40ecb816ed2e945271ab] [formerly dd0fea0fb3 [formerly a8e2fca3c7]]
Former-commit-id: 9699f02ec43c86c206c32dd655bde46c56cd4c26 [formerly dd0fea0fb3]
Former-commit-id: 46a895d8dc
|
2015-06-29 17:46:23 -06:00 |
|
AWIPS User
|
3c4d941857
|
ui frame increase/d2d for developer.product/test file regex for obs and radar.
Former-commit-id: 93c78adbee [formerly 86a579e940] [formerly e3d9d5602f] [formerly bf2b48cdf3e64e99b6b6f85b957cc5a1af8b3c81 [formerly 3938673621f8cdfbd6a1e1dca7c3c4db21cccf4e] [formerly e3d9d5602f [formerly 7b803d9c61]]]
Former-commit-id: 651969507745d351afbecdf82b708ce97e3b88c2 [formerly f2772294e59c1ecf4b52e77b3c2cf77d3ed54161] [formerly ceab543656 [formerly 283ffab705]]
Former-commit-id: ceab543656
Former-commit-id: 7fdb57c96c
|
2015-06-22 16:00:26 -05:00 |
|
AWIPS User
|
fa287bd148
|
EDEX deploy/debug through Eclipse remote Java Appliccation, with OHD features muted to not cause HydroApps to barf when starting ingest
Former-commit-id: 72fa4e61d6 [formerly 34621995c5] [formerly bd97d027b0] [formerly 4c170d6b3892e60a36d5ff8f6980c7d4240c96e2 [formerly ee9bf86633fd63175f335cb1b38c9e2774c62f0f] [formerly bd97d027b0 [formerly 4a7c625c19]]]
Former-commit-id: e9ba6062f3b992198f28dcfd1701f0a9f7044c8e [formerly e4175b970a93d2ae716dfdb512dfab83bf5cc8e6] [formerly b1508ea152 [formerly eca64770aa]]
Former-commit-id: b1508ea152
Former-commit-id: fc64316876
|
2015-06-16 10:12:12 -06:00 |
|
AWIPS User
|
8118379352
|
RadarMenuUtil now builds from MOSAIC_RADAR (full list) rather than DIAL_RADAR
Former-commit-id: cbd36c66cc [formerly 9649d324f7] [formerly b6b737c0df] [formerly 3ab1af9a6c59c47199ff898b511b300e9aaeee40 [formerly b0de64df78c644d48e5c0533f66d028351963333] [formerly b6b737c0df [formerly 21e4ee2d0c]]]
Former-commit-id: 36641049eb0fa62b4f0d0a892acb074750c692c8 [formerly 89adfeb39c4bb6037c9565d153948f9d57a3bd35] [formerly 82d2f640d9 [formerly 6e885e0335]]
Former-commit-id: 82d2f640d9
Former-commit-id: c27ebe7056
|
2015-04-24 07:46:18 -06:00 |
|
AWIPS User
|
acc3efafdb
|
LOCAL_RADARS will not show under main menu anymore
Former-commit-id: e3d32f2f98 [formerly 26d3cfdf39] [formerly 07afa1ef0d] [formerly 1df025d45f2fd928ae54e532f511f7ae62a8d774 [formerly 13396447405d71652a5a45bdf024e2c65f3a9c5b] [formerly 07afa1ef0d [formerly 67632b57bd]]]
Former-commit-id: d313f979e4c213a7d90de436efd88561d7731f48 [formerly 8a107784ef89e4f80b84cf9d84c51f656bc40204] [formerly 4f28f24f15 [formerly 98678aa032]]
Former-commit-id: 4f28f24f15
Former-commit-id: 46f7e6bb8d
|
2015-04-22 17:34:42 -06:00 |
|
AWIPS User
|
bfa6b73b62
|
TDWR menu separate from NEXRAD sites
Former-commit-id: b59b2b9467 [formerly a2b9a1d78c] [formerly b402f25eca] [formerly 92c21dd1290963523b2086810618b9c4258a3c9c [formerly 838f9a10ed9485a2332abf8360333c30a03c784b] [formerly b402f25eca [formerly aa23b0afe0]]]
Former-commit-id: 95016cef668b71d363f0a34bc41c8b7d0ccdd976 [formerly 090bc56cb5b52d559971a30bff06a90b7e281107] [formerly a1a9195e79 [formerly fa78f4b8c6]]
Former-commit-id: 0fa7e8270f95df46b2c2c8f5bea129f3b3814a6b [formerly a1a9195e79]
Former-commit-id: f6df3bb55c
|
2015-04-22 17:28:24 -06:00 |
|
AWIPS User
|
2764fd1241
|
D2D menus
Former-commit-id: bb368916b9 [formerly b992f650c3] [formerly 0e116e6e5a] [formerly 79fd455ec967fcaa94a402cdf7fd7d689681c293 [formerly 1c74b47a384ca893f233d0e5aa1c22ab4d23dd24] [formerly 0e116e6e5a [formerly 2a6d837672]]]
Former-commit-id: e4c7af2397637ad70491bc2d5b6fd6ae179a07a1 [formerly cbc7b955d1b9dd187b1b63139e38924d8eb92a49] [formerly 3337eead54 [formerly 9ba75100cb]]
Former-commit-id: 3337eead54
Former-commit-id: 7101784a38
|
2015-04-22 17:05:35 -06:00 |
|
Steve Harris
|
de00ba4b57
|
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7375074ed8 [formerly 7cad81591e22bc1a46f54982f0cd0ca647208290]
Former-commit-id: 1aab7b1831
|
2015-03-30 11:07:52 -05:00 |
|
Ben Steffensmeier
|
a481bada83
|
Omaha #4319 Save volume scan number
Former-commit-id: e6a8f3e6a0 [formerly 76cf847f8c8d7248f99db13ac59f34d1186e01e6]
Former-commit-id: e1a3e0023e
|
2015-03-25 18:05:00 -05:00 |
|
Ana Rivera
|
a3336f3d8e
|
Merge "VLab Issue #6615 - DR_17086 Derived TDWR products do not have green time; fixes #6615" into field_15.1.1
Former-commit-id: a4b5bf232f [formerly 76e7f1dc1382745bf014041e29856b05198d8d65]
Former-commit-id: 8670f04ae9
|
2015-03-03 18:53:03 +00:00 |
|
Zihou Wang
|
ed9b996fa4
|
VLab Issue #6616 - DR_17099 Can not display TLAS elev 0.8 product; fixes #6616
Change-Id: I085db53fab11899acf65118d5f87a1c6421e6f59
Former-commit-id: 9283473138 [formerly a92820ad4717a20cb8904b80ab0531739fe71a31]
Former-commit-id: bd49e81e7f
|
2015-02-27 18:15:38 +00:00 |
|
Zihou Wang
|
47107e5c45
|
VLab Issue #6615 - DR_17086 Derived TDWR products do not have green time; fixes #6615
Change-Id: Id810ac9ef4fdf0840253c30f52ca9ea3384d2da0
Former-commit-id: 728f2cdcf0 [formerly 9c3f0157d1d231555bd984d901204915c26bbf6d]
Former-commit-id: 76b867c6f9
|
2015-02-27 16:19:51 +00:00 |
|
Fay.Liang
|
6beb73adcb
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: b0553b2062 [formerly 1adbe5f79d] [formerly 3aa9f17455] [formerly 3aa9f17455 [formerly 07c742044d]] [formerly b0553b2062 [formerly 1adbe5f79d] [formerly 3aa9f17455] [formerly 3aa9f17455 [formerly 07c742044d]] [formerly de502a310b [formerly 3aa9f17455 [formerly 07c742044d] [formerly de502a310b [formerly 8f839ec64da04492e6cf109fdf47b95f08db5388]]]]]
Former-commit-id: de502a310b
Former-commit-id: 2c9c238c9f [formerly 99a4b44c8a] [formerly f075116f65] [formerly 9ce4f21d080f69c69f5392a41092e5d5a7ea33bc [formerly d231ab28435e2f65bc8ff6d93bb9fd5f679fa47a] [formerly f075116f65 [formerly 7517728c42]]]
Former-commit-id: 6218869c75e85384c05830544ecc394f2c8f8151 [formerly 5e6472d40bbea721fe507f096045f2af8c2cb055] [formerly 267fb768d9 [formerly a3c39c1a8d]]
Former-commit-id: 267fb768d9
Former-commit-id: 7f546a3e77
|
2015-02-03 16:04:56 -05:00 |
|
Fay.Liang
|
3aa9f17455
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: de502a310b [formerly 8f839ec64da04492e6cf109fdf47b95f08db5388]
Former-commit-id: 07c742044d
|
2015-02-03 16:04:56 -05:00 |
|
Fay.Liang
|
48709b35fe
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 7473924bd0 [formerly 2bd6d69680] [formerly 4c69a4bc24] [formerly 4c69a4bc24 [formerly 8aa0a2a200]] [formerly 7473924bd0 [formerly 2bd6d69680] [formerly 4c69a4bc24] [formerly 4c69a4bc24 [formerly 8aa0a2a200]] [formerly e8b40ad087 [formerly 4c69a4bc24 [formerly 8aa0a2a200] [formerly e8b40ad087 [formerly 8c72e62260026a2d1d2fb41839f1e79535b09b7f]]]]]
Former-commit-id: e8b40ad087
Former-commit-id: d2351191bb [formerly a4f30336c4] [formerly 18dc24db2a] [formerly 7dedf240dc98b169ea53ca779d3aa2131843cb08 [formerly 01217c4094f33fd5a46ddccc914441cd659c53c5] [formerly 18dc24db2a [formerly c211279c0a]]]
Former-commit-id: 00d070b53d97cf37b1f76c5d406c6f6d35227dcf [formerly 46626d81fe8e10af7e2287e76e266b90a1d7d536] [formerly ce13acde08 [formerly 0c10a2fd3a]]
Former-commit-id: ce13acde08
Former-commit-id: 380657ecfd
|
2015-01-28 14:31:02 -05:00 |
|
Fay.Liang
|
4c69a4bc24
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: e8b40ad087 [formerly 8c72e62260026a2d1d2fb41839f1e79535b09b7f]
Former-commit-id: 8aa0a2a200
|
2015-01-28 14:31:02 -05:00 |
|
Ana Rivera
|
a1548c4e95
|
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: 6b58d62fe3 [formerly dd232580d0] [formerly 62094315d2] [formerly 62094315d2 [formerly 7c5fc26537]] [formerly 6b58d62fe3 [formerly dd232580d0] [formerly 62094315d2] [formerly 62094315d2 [formerly 7c5fc26537]] [formerly 327945af8b [formerly 62094315d2 [formerly 7c5fc26537] [formerly 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]]]]]
Former-commit-id: 327945af8b
Former-commit-id: 5fa992e7c1 [formerly 11426c1e60] [formerly a84f43a8c6] [formerly 9e3eee876054f8d0a3e5fe0f7f75e4e99ab850d3 [formerly e41d85a493744309b4e1cd1f506bbd5cb6613c13] [formerly a84f43a8c6 [formerly 5e97e24201]]]
Former-commit-id: 42467b8e00f121c5cd5cf5dd6bb82c8d31037429 [formerly 89cb464614c3ae953a939f0b777e03f7ef4daf11] [formerly d4e36fe496 [formerly ef4ca10b8a]]
Former-commit-id: d4e36fe496
Former-commit-id: d87f6071d6
|
2015-01-27 16:28:42 +00:00 |
|
Ana Rivera
|
62094315d2
|
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: 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]
Former-commit-id: 7c5fc26537
|
2015-01-27 16:28:42 +00:00 |
|
Daniel.Huffman
|
1f36fd547a
|
ASM #17057 RadarDecoder::AlertMessageSanityCheck
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: ff0ba477b9 [formerly 6fb4fb0a86] [formerly f4ac238888] [formerly f4ac238888 [formerly 845998cbfa]] [formerly ff0ba477b9 [formerly 6fb4fb0a86] [formerly f4ac238888] [formerly f4ac238888 [formerly 845998cbfa]] [formerly a25fa81a0f [formerly f4ac238888 [formerly 845998cbfa] [formerly a25fa81a0f [formerly 498f55c757f20f70b11a921a2e5948c3c7c49c90]]]]]
Former-commit-id: a25fa81a0f
Former-commit-id: 4d8c1af09a [formerly 4016a67784] [formerly c5a37c5e9c] [formerly a06bbd0d629fa7484b3d84d57f5d779cd064e121 [formerly 2ecdbdf6e033350398bbc752412af08a872eb9a3] [formerly c5a37c5e9c [formerly 1fe93bcfa4]]]
Former-commit-id: a6e0e851f07680bfbd1dd13036f9d5fced087b80 [formerly ea10d3102950fc8fe0eea40cf7c696cca16e24e7] [formerly 8367208ad3 [formerly ce963e91fa]]
Former-commit-id: 8367208ad3
Former-commit-id: 73102ace30
|
2015-01-22 21:13:04 +00:00 |
|
Daniel.Huffman
|
f4ac238888
|
ASM #17057 RadarDecoder::AlertMessageSanityCheck
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: a25fa81a0f [formerly 498f55c757f20f70b11a921a2e5948c3c7c49c90]
Former-commit-id: 845998cbfa
|
2015-01-22 21:13:04 +00:00 |
|
Fay.Liang
|
660e749630
|
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: 1e3dff2da2 [formerly 19a29da5de] [formerly 6b77894bd0] [formerly 6b77894bd0 [formerly c6bd5d7675]] [formerly 1e3dff2da2 [formerly 19a29da5de] [formerly 6b77894bd0] [formerly 6b77894bd0 [formerly c6bd5d7675]] [formerly eed6737801 [formerly 6b77894bd0 [formerly c6bd5d7675] [formerly eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]]
Former-commit-id: eed6737801
Former-commit-id: ce29afab3c [formerly 23ba9f4154] [formerly f3ecae8573] [formerly 3e0b1b79e56696bcec54e0a049ea397445611958 [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e] [formerly f3ecae8573 [formerly 5cc8e5b4af]]]
Former-commit-id: 3408395492fc2cd332f0231e3972dedb14c881df [formerly cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e] [formerly 1e9024ede9 [formerly 06ac6b396e]]
Former-commit-id: 1e9024ede9
Former-commit-id: bccf70f0bd
|
2015-01-12 13:03:31 -05:00 |
|
Fay.Liang
|
6b77894bd0
|
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: eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]
Former-commit-id: c6bd5d7675
|
2015-01-12 13:03:31 -05:00 |
|
Daniel.Huffman
|
4a3781de7a
|
ASM #632 -Filter erroneous RPG alert messages.
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e
Former-commit-id: 4790d5cc6b [formerly f4ea480d38] [formerly 22f923eaf5] [formerly 22f923eaf5 [formerly 9db291b296]] [formerly 4790d5cc6b [formerly f4ea480d38] [formerly 22f923eaf5] [formerly 22f923eaf5 [formerly 9db291b296]] [formerly 7a563dd505 [formerly 22f923eaf5 [formerly 9db291b296] [formerly 7a563dd505 [formerly d7d3bc55053f16da410d3ebe1ef055e93d198790]]]]]
Former-commit-id: 7a563dd505
Former-commit-id: 6569dc04c4 [formerly 7b1fab2aea] [formerly ccc9cf5662] [formerly e189668ae83ab59bedcb22d11e6bb8791db5a8be [formerly 32744a5d8c21b6d50edd1fb162d0edab489546c7] [formerly ccc9cf5662 [formerly c7b973493f]]]
Former-commit-id: 04096d5f830c8570fc25d384a137ae01d43d1745 [formerly b0612e200ebfb5c1f4da5f9ba71ba5ad87750add] [formerly 9b6f13244f [formerly 93e0aad16e]]
Former-commit-id: 9b6f13244f
Former-commit-id: 5f584808fb
|
2015-01-07 00:41:35 +00:00 |
|
Daniel.Huffman
|
22f923eaf5
|
ASM #632 -Filter erroneous RPG alert messages.
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e
Former-commit-id: 7a563dd505 [formerly d7d3bc55053f16da410d3ebe1ef055e93d198790]
Former-commit-id: 9db291b296
|
2015-01-07 00:41:35 +00:00 |
|
Ana Rivera
|
ec63f5a069
|
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: 0923ddca17 [formerly 1f5dd0c92b] [formerly 214be0a93b] [formerly 214be0a93b [formerly 043bc3a8b7]] [formerly 0923ddca17 [formerly 1f5dd0c92b] [formerly 214be0a93b] [formerly 214be0a93b [formerly 043bc3a8b7]] [formerly 1823ed3596 [formerly 214be0a93b [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]]]
Former-commit-id: 1823ed3596
Former-commit-id: 2a4a15b531 [formerly 90efb445f0] [formerly ef35771bfa] [formerly 9d95fa5faf986b4dfa99c70eab33e6d8563207bc [formerly df1f34b8c00ffdaeec21c1d4b59bdc4ae9648cb2] [formerly ef35771bfa [formerly d2d8127363]]]
Former-commit-id: b6e3f11a2089444882a8489c36fb2e248348287e [formerly d7532e0824a0a0330656fbdab24737f609c2a10f] [formerly 40df82b005 [formerly f7c0319ee4]]
Former-commit-id: ba1fc0174dfbaa6dd9cd56dcd7b8ed148a2537c3 [formerly 40df82b005]
Former-commit-id: 769df60be8
|
2014-12-16 23:39:02 +00:00 |
|
Ana Rivera
|
214be0a93b
|
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: 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]
Former-commit-id: 043bc3a8b7
|
2014-12-16 23:39:02 +00:00 |
|
Nate Jensen
|
6b7e82c8f5
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: e291bd932f [formerly effb6c68bf] [formerly 6c1391e938] [formerly 6c1391e938 [formerly ec28d2f1a0]] [formerly e291bd932f [formerly effb6c68bf] [formerly 6c1391e938] [formerly 6c1391e938 [formerly ec28d2f1a0]] [formerly 8dbe6abbe4 [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 6a3723e9ec [formerly 3202b579c1] [formerly 1c5057a13f] [formerly ad98533de0e16d2987f10853c7d9d9c26929b8a7 [formerly fe8f15a6cf651b03c628440d9b584168f73a916a] [formerly 1c5057a13f [formerly 291de3f039]]]
Former-commit-id: e04e06ff2523a32fc664bd3cf1fd177746c10dfd [formerly 62ac51e4fd5ddf96d1a40756fde9b064052645f9] [formerly 0bb18f02d0 [formerly e53063661e]]
Former-commit-id: 2a87b2577c7e0445a15a2430cd4ab102809a8789 [formerly 0bb18f02d0]
Former-commit-id: ad2a20dd43
|
2014-12-03 15:47:10 -06:00 |
|
Nate Jensen
|
6c1391e938
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]
Former-commit-id: ec28d2f1a0
|
2014-12-03 15:47:10 -06:00 |
|
Zihou Wang
|
1ea6c4dfba
|
VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d
Former-commit-id: 6c1945e85f [formerly 3ea0e0d218] [formerly 8d24be996a] [formerly 8d24be996a [formerly 4fe74892ea]] [formerly 6c1945e85f [formerly 3ea0e0d218] [formerly 8d24be996a] [formerly 8d24be996a [formerly 4fe74892ea]] [formerly 5c86a177b7 [formerly 8d24be996a [formerly 4fe74892ea] [formerly 5c86a177b7 [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]]]]]
Former-commit-id: 5c86a177b7
Former-commit-id: ddeb874e68 [formerly c754ac5448] [formerly 30be251dc9] [formerly 84d92bfa6cea83a0c14574b1ca4eabf6a55c4b93 [formerly 973f3734dffa4498dfb2ae9312c2b68cc51c9bcd] [formerly 30be251dc9 [formerly d4ca49f01d]]]
Former-commit-id: 6498f0a3912381c89681731c8d6d4d0e79c4d3a9 [formerly e3714090e20a831caf11746053ae333eb208870b] [formerly de979397f4 [formerly a47f4908e7]]
Former-commit-id: daa4aceab6a78a283e71abb1a1fb52228a3a4f4b [formerly de979397f4]
Former-commit-id: e9c3965738
|
2014-11-21 15:42:48 +00:00 |
|
Zihou Wang
|
8d24be996a
|
VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d
Former-commit-id: 5c86a177b7 [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]
Former-commit-id: 4fe74892ea
|
2014-11-21 15:42:48 +00:00 |
|
Ana Rivera
|
8f851fe771
|
Merge "VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949" into field_14.4.1
Former-commit-id: 4520831b7f [formerly 939c50adb8] [formerly 73c3b0f24a] [formerly 73c3b0f24a [formerly 2bc144f4ab]] [formerly 4520831b7f [formerly 939c50adb8] [formerly 73c3b0f24a] [formerly 73c3b0f24a [formerly 2bc144f4ab]] [formerly 7f2d7fa4da [formerly 73c3b0f24a [formerly 2bc144f4ab] [formerly 7f2d7fa4da [formerly 25621f54d48002d79b0fa80c12f7310580432374]]]]]
Former-commit-id: 7f2d7fa4da
Former-commit-id: ebc4df999c [formerly 03dd8e029a] [formerly 71fc661bf6] [formerly c88f2e045f95d22abd02bc14e99671f207812893 [formerly c64c4ae14b794efcb10a71b2ac66179d46b98e77] [formerly 71fc661bf6 [formerly e41e55ce60]]]
Former-commit-id: 09a013154ead58bb02002b5f1b9d4890f1eef7dc [formerly a2dc43b8b4da41c5769985850f91283c1bf1a3d9] [formerly 832d246a59 [formerly 05ec271272]]
Former-commit-id: 0c0e161d28597e2a8f8a8e39b69372d8ba3f98bf [formerly 832d246a59]
Former-commit-id: 1a313e9017
|
2014-11-20 18:33:54 -05:00 |
|
Ana Rivera
|
73c3b0f24a
|
Merge "VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949" into field_14.4.1
Former-commit-id: 7f2d7fa4da [formerly 25621f54d48002d79b0fa80c12f7310580432374]
Former-commit-id: 2bc144f4ab
|
2014-11-20 18:33:54 -05:00 |
|
Ana Rivera
|
7ac619849b
|
Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I4ffce1e09a6ad2c8a2428907a8b8e2bcedcefe4c
Former-commit-id: cf6ea2744a [formerly 10d99edb83] [formerly 6749c3e52f] [formerly 6749c3e52f [formerly b377106409]] [formerly cf6ea2744a [formerly 10d99edb83] [formerly 6749c3e52f] [formerly 6749c3e52f [formerly b377106409]] [formerly 0fa5c4e483 [formerly 6749c3e52f [formerly b377106409] [formerly 0fa5c4e483 [formerly ea2276a9ac116613b032828e4a4b82f67fc6ba8d]]]]]
Former-commit-id: 0fa5c4e483
Former-commit-id: 0faeb54ded [formerly af2d6a3c9e] [formerly 506895ce06] [formerly feff2600405f91975d882b61fb55edbca0e031c6 [formerly 3134b1376f83b8f70bc55ad714b02f0ec490d12b] [formerly 506895ce06 [formerly 729e77624e]]]
Former-commit-id: ea995bcb6ebd23c3aa25533cfaf235f60fc5a6db [formerly 724f1642dd78f1989d1ba4ffc06f0875f0c71cf1] [formerly 35dd2f3c52 [formerly 8c29e1de8c]]
Former-commit-id: 35dd2f3c52
Former-commit-id: 23784604c4
|
2014-11-20 16:17:42 +00:00 |
|
Ana Rivera
|
6749c3e52f
|
Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I4ffce1e09a6ad2c8a2428907a8b8e2bcedcefe4c
Former-commit-id: 0fa5c4e483 [formerly ea2276a9ac116613b032828e4a4b82f67fc6ba8d]
Former-commit-id: b377106409
|
2014-11-20 16:17:42 +00:00 |
|
Benjamin Phillippe
|
5bf0e03a29
|
Omaha #3454 Fixing usage of getSession() to ensure proper session closure
Former-commit-id: 08c4073707 [formerly 0e91e25bd0] [formerly 8cd0c6542c] [formerly 8cd0c6542c [formerly bbd2081844]] [formerly 08c4073707 [formerly 0e91e25bd0] [formerly 8cd0c6542c] [formerly 8cd0c6542c [formerly bbd2081844]] [formerly 50f5c8d1e3 [formerly 8cd0c6542c [formerly bbd2081844] [formerly 50f5c8d1e3 [formerly fc36b84fa43c354b674f040ae5d2647df5b3122f]]]]]
Former-commit-id: 50f5c8d1e3
Former-commit-id: 9cdca3d926 [formerly a18598b5f3] [formerly 8bbb7b35b4] [formerly ab4901a7c4f4b9361a58e9c16cb59329357cb683 [formerly 5d0023283ccc0c6504a8b214b567f15a6c607f65] [formerly 8bbb7b35b4 [formerly a9e2e96d76]]]
Former-commit-id: 88781a66ee70ad6ffdbcb6da653dc2d22af2e2c2 [formerly fdab43e048679b66eb116474d43a20cae22f3926] [formerly 31108feda5 [formerly 8632c490c0]]
Former-commit-id: 31108feda5
Former-commit-id: b5b375eb25
|
2014-10-28 11:30:25 -05:00 |
|
Benjamin Phillippe
|
8cd0c6542c
|
Omaha #3454 Fixing usage of getSession() to ensure proper session closure
Former-commit-id: 50f5c8d1e3 [formerly fc36b84fa43c354b674f040ae5d2647df5b3122f]
Former-commit-id: bbd2081844
|
2014-10-28 11:30:25 -05:00 |
|
Ana Rivera
|
4315145238
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: c5a9871924 [formerly 147ea30ebb] [formerly 69832d1fe3] [formerly 69832d1fe3 [formerly 999c66b3e4]] [formerly c5a9871924 [formerly 147ea30ebb] [formerly 69832d1fe3] [formerly 69832d1fe3 [formerly 999c66b3e4]] [formerly 86648e0a20 [formerly 69832d1fe3 [formerly 999c66b3e4] [formerly 86648e0a20 [formerly 875c825320bdfb0e051b6d0ad2e530f7a7a16d19]]]]]
Former-commit-id: 86648e0a20
Former-commit-id: 2ebd8e60e9 [formerly 6c35db8d4d] [formerly aa06e38595] [formerly 9effb77e90dd4fb30219f147440fc430cf1bc50c [formerly 82e20f8fa6aa3851192c68860e5e7f1c90601c75] [formerly aa06e38595 [formerly 0a2ecb9beb]]]
Former-commit-id: d905244b61a57862f47e7080fac99801ccfa2d63 [formerly 12a6d9a20deebb092f64f070247578918326d56d] [formerly fc74bce6b8 [formerly 8770ba8303]]
Former-commit-id: fc74bce6b8
Former-commit-id: ad4a87da6e
|
2014-10-22 12:58:09 +00:00 |
|
Ana Rivera
|
69832d1fe3
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 86648e0a20 [formerly 875c825320bdfb0e051b6d0ad2e530f7a7a16d19]
Former-commit-id: 999c66b3e4
|
2014-10-22 12:58:09 +00:00 |
|
Benjamin Phillippe
|
37baae1c0e
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: 81a16aa4de [formerly af4f8e1c8a] [formerly e6deeb6fb5] [formerly e6deeb6fb5 [formerly 7845e8e40f]] [formerly 81a16aa4de [formerly af4f8e1c8a] [formerly e6deeb6fb5] [formerly e6deeb6fb5 [formerly 7845e8e40f]] [formerly fdd16051e8 [formerly e6deeb6fb5 [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]]]
Former-commit-id: fdd16051e8
Former-commit-id: 657886f0be [formerly c77edf49f8] [formerly a8ef477042] [formerly 71284821d1f5dc6a417253b3fb722ec85ada2e7b [formerly d7e89f87bfd941634f6cb4c75072b070108267c4] [formerly a8ef477042 [formerly 5eec33b078]]]
Former-commit-id: 4c8009a4d7aa5a098251ae0929f9c78046a40238 [formerly 62bf8f62e268a6361913c3567879ca0d71e2b3ef] [formerly 008b23be1e [formerly 3808c125b9]]
Former-commit-id: 008b23be1e
Former-commit-id: b4acac2eaa
|
2014-10-20 12:42:19 -05:00 |
|
Benjamin Phillippe
|
e6deeb6fb5
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]
Former-commit-id: 7845e8e40f
|
2014-10-20 12:42:19 -05:00 |
|
Zihou Wang
|
7853b22396
|
VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949
Change-Id: Ibd23504598b7cb981a061daea6cc3dc8b03b8df4
Former-commit-id: 96cd011b8e [formerly 587e81190f] [formerly 63184f7d21] [formerly 63184f7d21 [formerly 8d19ef88b2]] [formerly 96cd011b8e [formerly 587e81190f] [formerly 63184f7d21] [formerly 63184f7d21 [formerly 8d19ef88b2]] [formerly 555784e716 [formerly 63184f7d21 [formerly 8d19ef88b2] [formerly 555784e716 [formerly f942403a5d6cb57c5c2772c2eec986e014e9e9be]]]]]
Former-commit-id: 555784e716
Former-commit-id: 759449ef07 [formerly eca38fb95b] [formerly 454f3db995] [formerly 7f3c62f87be25afb978457af2ced36192c439de2 [formerly 2b9873a72efa6dba5f166a62a2096c17ddb81f46] [formerly 454f3db995 [formerly c7dce05162]]]
Former-commit-id: 96304970c8efc491a3bc18b50f934ec93578323d [formerly fcef219c4a5ac7f903615bd0d80172007fa1d842] [formerly 3d8b2d2747 [formerly decba804fd]]
Former-commit-id: 3d8b2d2747
Former-commit-id: 7fc8cf876b
|
2014-10-16 19:02:13 +00:00 |
|
Zihou Wang
|
63184f7d21
|
VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949
Change-Id: Ibd23504598b7cb981a061daea6cc3dc8b03b8df4
Former-commit-id: 555784e716 [formerly f942403a5d6cb57c5c2772c2eec986e014e9e9be]
Former-commit-id: 8d19ef88b2
|
2014-10-16 19:02:13 +00:00 |
|
Ana Rivera
|
0bc744ccfd
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I04cb8478a05b157e4acfc5f9ef02a9fd9186fe22
Former-commit-id: 63b935ce5c [formerly a96df6d6ad] [formerly 0c11f99805] [formerly 0c11f99805 [formerly 796380dd53]] [formerly 63b935ce5c [formerly a96df6d6ad] [formerly 0c11f99805] [formerly 0c11f99805 [formerly 796380dd53]] [formerly adfeb13067 [formerly 0c11f99805 [formerly 796380dd53] [formerly adfeb13067 [formerly 56dc338129ed46612df4db1926e0b7e91551b60d]]]]]
Former-commit-id: adfeb13067
Former-commit-id: 357c32974c [formerly 0371accc47] [formerly 60f9feed3e] [formerly 7378b42d4c3658f188a8dd75702d6d9be0ad0f52 [formerly f6e448879003172c3aafecc16e87e7783e176970] [formerly 60f9feed3e [formerly 12c854e7cc]]]
Former-commit-id: e5bf369599a818f5475561479bc2cb660dc9e2bb [formerly f350b0f60c1e207b1fc2e10edfcd604fb4c9e1cb] [formerly cb21a22731 [formerly baf0eb6291]]
Former-commit-id: cb21a22731
Former-commit-id: 094d18d1ac
|
2014-09-30 19:59:19 +00:00 |
|