Commit graph

197 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
mjames-upc
245f23b260 full set base level radarsInUse.txt
Former-commit-id: 2fc83a180b
2015-11-05 14:39:41 -07:00
AWIPS User
1c682e0af1 sat and radar menu organization
Former-commit-id: affd4212ed [formerly 698c0b5166] [formerly 8f8b9dd16ea8ae10522f0f5092dcc20a9676444f [formerly 0943c3edd5]]
Former-commit-id: fe06833d7f0b88c2fd77bec7b274dfbdaa6ab9cd [formerly 4c91c17326]
Former-commit-id: d3b35a2e3a
2015-07-22 10:31:01 -06:00
mjames-upc
46a895d8dc radar decoder threads increased to 4
Former-commit-id: 7e472929dd [formerly c565061e4c] [formerly 4f55e5877214b5c73394abcdc0d98bdfd16806c1 [formerly 9b0adeadea]]
Former-commit-id: 6064982345be766500cb40ecb816ed2e945271ab [formerly a8e2fca3c7]
Former-commit-id: dd0fea0fb3
2015-06-29 17:46:23 -06:00
AWIPS User
7fdb57c96c ui frame increase/d2d for developer.product/test file regex for obs and radar.
Former-commit-id: 86a579e940 [formerly e3d9d5602f] [formerly 3938673621f8cdfbd6a1e1dca7c3c4db21cccf4e [formerly 7b803d9c61]]
Former-commit-id: f2772294e59c1ecf4b52e77b3c2cf77d3ed54161 [formerly 283ffab705]
Former-commit-id: ceab543656
2015-06-22 16:00:26 -05:00
AWIPS User
fc64316876 EDEX deploy/debug through Eclipse remote Java Appliccation, with OHD features muted to not cause HydroApps to barf when starting ingest
Former-commit-id: 34621995c5 [formerly bd97d027b0] [formerly ee9bf86633fd63175f335cb1b38c9e2774c62f0f [formerly 4a7c625c19]]
Former-commit-id: e4175b970a93d2ae716dfdb512dfab83bf5cc8e6 [formerly eca64770aa]
Former-commit-id: b1508ea152
2015-06-16 10:12:12 -06:00
AWIPS User
c27ebe7056 RadarMenuUtil now builds from MOSAIC_RADAR (full list) rather than DIAL_RADAR
Former-commit-id: 9649d324f7 [formerly b6b737c0df] [formerly b0de64df78c644d48e5c0533f66d028351963333 [formerly 21e4ee2d0c]]
Former-commit-id: 89adfeb39c4bb6037c9565d153948f9d57a3bd35 [formerly 6e885e0335]
Former-commit-id: 82d2f640d9
2015-04-24 07:46:18 -06:00
AWIPS User
46f7e6bb8d LOCAL_RADARS will not show under main menu anymore
Former-commit-id: 26d3cfdf39 [formerly 07afa1ef0d] [formerly 13396447405d71652a5a45bdf024e2c65f3a9c5b [formerly 67632b57bd]]
Former-commit-id: 8a107784ef89e4f80b84cf9d84c51f656bc40204 [formerly 98678aa032]
Former-commit-id: 4f28f24f15
2015-04-22 17:34:42 -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
AWIPS User
7101784a38 D2D menus
Former-commit-id: b992f650c3 [formerly 0e116e6e5a] [formerly 1c74b47a384ca893f233d0e5aa1c22ab4d23dd24 [formerly 2a6d837672]]
Former-commit-id: cbc7b955d1b9dd187b1b63139e38924d8eb92a49 [formerly 9ba75100cb]
Former-commit-id: 3337eead54
2015-04-22 17:05:35 -06:00
Steve Harris
1aab7b1831 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: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Ben Steffensmeier
e1a3e0023e Omaha #4319 Save volume scan number
Former-commit-id: 76cf847f8c8d7248f99db13ac59f34d1186e01e6
2015-03-25 18:05:00 -05:00
Ana Rivera
8670f04ae9 Merge "VLab Issue #6615 - DR_17086 Derived TDWR products do not have green time; fixes #6615" into field_15.1.1
Former-commit-id: 76e7f1dc1382745bf014041e29856b05198d8d65
2015-03-03 18:53:03 +00:00
Zihou Wang
bd49e81e7f VLab Issue #6616 - DR_17099 Can not display TLAS elev 0.8 product; fixes #6616
Change-Id: I085db53fab11899acf65118d5f87a1c6421e6f59

Former-commit-id: a92820ad4717a20cb8904b80ab0531739fe71a31
2015-02-27 18:15:38 +00:00
Zihou Wang
76b867c6f9 VLab Issue #6615 - DR_17086 Derived TDWR products do not have green time; fixes #6615
Change-Id: Id810ac9ef4fdf0840253c30f52ca9ea3384d2da0

Former-commit-id: 9c3f0157d1d231555bd984d901204915c26bbf6d
2015-02-27 16:19:51 +00:00
Fay.Liang
7f546a3e77 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 1adbe5f79d [formerly 3aa9f17455] [formerly 07c742044d] [formerly 1adbe5f79d [formerly 3aa9f17455] [formerly 07c742044d] [formerly de502a310b [formerly 07c742044d [formerly 8f839ec64da04492e6cf109fdf47b95f08db5388]]]]
Former-commit-id: de502a310b
Former-commit-id: 99a4b44c8a [formerly f075116f65] [formerly d231ab28435e2f65bc8ff6d93bb9fd5f679fa47a [formerly 7517728c42]]
Former-commit-id: 5e6472d40bbea721fe507f096045f2af8c2cb055 [formerly a3c39c1a8d]
Former-commit-id: 267fb768d9
2015-02-03 16:04:56 -05:00
Fay.Liang
07c742044d Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 8f839ec64da04492e6cf109fdf47b95f08db5388
2015-02-03 16:04:56 -05:00
Fay.Liang
380657ecfd Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 2bd6d69680 [formerly 4c69a4bc24] [formerly 8aa0a2a200] [formerly 2bd6d69680 [formerly 4c69a4bc24] [formerly 8aa0a2a200] [formerly e8b40ad087 [formerly 8aa0a2a200 [formerly 8c72e62260026a2d1d2fb41839f1e79535b09b7f]]]]
Former-commit-id: e8b40ad087
Former-commit-id: a4f30336c4 [formerly 18dc24db2a] [formerly 01217c4094f33fd5a46ddccc914441cd659c53c5 [formerly c211279c0a]]
Former-commit-id: 46626d81fe8e10af7e2287e76e266b90a1d7d536 [formerly 0c10a2fd3a]
Former-commit-id: ce13acde08
2015-01-28 14:31:02 -05:00
Fay.Liang
8aa0a2a200 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 8c72e62260026a2d1d2fb41839f1e79535b09b7f
2015-01-28 14:31:02 -05: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
Ana Rivera
7c5fc26537 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: 889608360567b829f81ed6392c64c669798f34a9
2015-01-27 16:28:42 +00:00
Daniel.Huffman
73102ace30 ASM #17057 RadarDecoder::AlertMessageSanityCheck
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c

Former-commit-id: 6fb4fb0a86 [formerly f4ac238888] [formerly 845998cbfa] [formerly 6fb4fb0a86 [formerly f4ac238888] [formerly 845998cbfa] [formerly a25fa81a0f [formerly 845998cbfa [formerly 498f55c757f20f70b11a921a2e5948c3c7c49c90]]]]
Former-commit-id: a25fa81a0f
Former-commit-id: 4016a67784 [formerly c5a37c5e9c] [formerly 2ecdbdf6e033350398bbc752412af08a872eb9a3 [formerly 1fe93bcfa4]]
Former-commit-id: ea10d3102950fc8fe0eea40cf7c696cca16e24e7 [formerly ce963e91fa]
Former-commit-id: 8367208ad3
2015-01-22 21:13:04 +00:00
Daniel.Huffman
845998cbfa ASM #17057 RadarDecoder::AlertMessageSanityCheck
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c

Former-commit-id: 498f55c757f20f70b11a921a2e5948c3c7c49c90
2015-01-22 21:13:04 +00: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
Fay.Liang
c6bd5d7675 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: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
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
Daniel.Huffman
9db291b296 ASM #632 -Filter erroneous RPG alert messages.
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e

Former-commit-id: d7d3bc55053f16da410d3ebe1ef055e93d198790
2015-01-07 00:41:35 +00: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
Ana Rivera
043bc3a8b7 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: 111ae763e6becb944e34e262e1d87d2d344236e4
2014-12-16 23:39:02 +00:00
Nate Jensen
ad2a20dd43 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: effb6c68bf [formerly 6c1391e938] [formerly ec28d2f1a0] [formerly effb6c68bf [formerly 6c1391e938] [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 3202b579c1 [formerly 1c5057a13f] [formerly fe8f15a6cf651b03c628440d9b584168f73a916a [formerly 291de3f039]]
Former-commit-id: 62ac51e4fd5ddf96d1a40756fde9b064052645f9 [formerly e53063661e]
Former-commit-id: 0bb18f02d0
2014-12-03 15:47:10 -06:00
Nate Jensen
ec28d2f1a0 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06: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
Zihou Wang
4fe74892ea VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d

Former-commit-id: e5e15da2f57e336d8f23444ab0932b710ad2c033
2014-11-21 15:42:48 +00:00
Ana Rivera
1a313e9017 Merge "VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949" into field_14.4.1
Former-commit-id: 939c50adb8 [formerly 73c3b0f24a] [formerly 2bc144f4ab] [formerly 939c50adb8 [formerly 73c3b0f24a] [formerly 2bc144f4ab] [formerly 7f2d7fa4da [formerly 2bc144f4ab [formerly 25621f54d48002d79b0fa80c12f7310580432374]]]]
Former-commit-id: 7f2d7fa4da
Former-commit-id: 03dd8e029a [formerly 71fc661bf6] [formerly c64c4ae14b794efcb10a71b2ac66179d46b98e77 [formerly e41e55ce60]]
Former-commit-id: a2dc43b8b4da41c5769985850f91283c1bf1a3d9 [formerly 05ec271272]
Former-commit-id: 832d246a59
2014-11-20 18:33:54 -05:00
Ana Rivera
2bc144f4ab Merge "VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949" into field_14.4.1
Former-commit-id: 25621f54d48002d79b0fa80c12f7310580432374
2014-11-20 18:33:54 -05:00
Ana Rivera
23784604c4 Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I4ffce1e09a6ad2c8a2428907a8b8e2bcedcefe4c

Former-commit-id: 10d99edb83 [formerly 6749c3e52f] [formerly b377106409] [formerly 10d99edb83 [formerly 6749c3e52f] [formerly b377106409] [formerly 0fa5c4e483 [formerly b377106409 [formerly ea2276a9ac116613b032828e4a4b82f67fc6ba8d]]]]
Former-commit-id: 0fa5c4e483
Former-commit-id: af2d6a3c9e [formerly 506895ce06] [formerly 3134b1376f83b8f70bc55ad714b02f0ec490d12b [formerly 729e77624e]]
Former-commit-id: 724f1642dd78f1989d1ba4ffc06f0875f0c71cf1 [formerly 8c29e1de8c]
Former-commit-id: 35dd2f3c52
2014-11-20 16:17:42 +00:00
Ana Rivera
b377106409 Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I4ffce1e09a6ad2c8a2428907a8b8e2bcedcefe4c

Former-commit-id: ea2276a9ac116613b032828e4a4b82f67fc6ba8d
2014-11-20 16:17:42 +00:00
Benjamin Phillippe
b5b375eb25 Omaha #3454 Fixing usage of getSession() to ensure proper session closure
Former-commit-id: 0e91e25bd0 [formerly 8cd0c6542c] [formerly bbd2081844] [formerly 0e91e25bd0 [formerly 8cd0c6542c] [formerly bbd2081844] [formerly 50f5c8d1e3 [formerly bbd2081844 [formerly fc36b84fa43c354b674f040ae5d2647df5b3122f]]]]
Former-commit-id: 50f5c8d1e3
Former-commit-id: a18598b5f3 [formerly 8bbb7b35b4] [formerly 5d0023283ccc0c6504a8b214b567f15a6c607f65 [formerly a9e2e96d76]]
Former-commit-id: fdab43e048679b66eb116474d43a20cae22f3926 [formerly 8632c490c0]
Former-commit-id: 31108feda5
2014-10-28 11:30:25 -05:00
Benjamin Phillippe
bbd2081844 Omaha #3454 Fixing usage of getSession() to ensure proper session closure
Former-commit-id: fc36b84fa43c354b674f040ae5d2647df5b3122f
2014-10-28 11:30:25 -05: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
Ana Rivera
999c66b3e4 Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 875c825320bdfb0e051b6d0ad2e530f7a7a16d19
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
Benjamin Phillippe
7845e8e40f Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
2014-10-20 12:42:19 -05:00
Zihou Wang
7fc8cf876b VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949
Change-Id: Ibd23504598b7cb981a061daea6cc3dc8b03b8df4

Former-commit-id: 587e81190f [formerly 63184f7d21] [formerly 8d19ef88b2] [formerly 587e81190f [formerly 63184f7d21] [formerly 8d19ef88b2] [formerly 555784e716 [formerly 8d19ef88b2 [formerly f942403a5d6cb57c5c2772c2eec986e014e9e9be]]]]
Former-commit-id: 555784e716
Former-commit-id: eca38fb95b [formerly 454f3db995] [formerly 2b9873a72efa6dba5f166a62a2096c17ddb81f46 [formerly c7dce05162]]
Former-commit-id: fcef219c4a5ac7f903615bd0d80172007fa1d842 [formerly decba804fd]
Former-commit-id: 3d8b2d2747
2014-10-16 19:02:13 +00:00
Zihou Wang
8d19ef88b2 VLab Issue #4949 - DR17399 Add PPS products to ASR/ARSR menu; fixes #4949
Change-Id: Ibd23504598b7cb981a061daea6cc3dc8b03b8df4

Former-commit-id: f942403a5d6cb57c5c2772c2eec986e014e9e9be
2014-10-16 19:02:13 +00: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
Ana Rivera
796380dd53 Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I04cb8478a05b157e4acfc5f9ef02a9fd9186fe22

Former-commit-id: 56dc338129ed46612df4db1926e0b7e91551b60d
2014-09-30 19:59:19 +00: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
Nathan Bowler
2fcc25bb9b Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts.
Change-Id: Ie3ea761920c1ecec233e1fc586f3cbcd5914f1c6

Former-commit-id: 44ca6fb8a26cc9af7267ce635a200eb3c26ce9f8
2014-08-21 10:55:28 -04:00
Greg Armendariz
c09b36924e Omaha #2914 - Remove calls to PropertiesFactory
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be

Former-commit-id: 22ede9935d [formerly e3f927e52c] [formerly b34486973e] [formerly 22ede9935d [formerly e3f927e52c] [formerly b34486973e] [formerly 09f6bd471c [formerly b34486973e [formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]]]]
Former-commit-id: 09f6bd471c
Former-commit-id: a1b39cf6a9 [formerly d51ab07c0e] [formerly 2ee58e133d702407605acad88e5488fe7ab6aed5 [formerly fcf1b5ee8a]]
Former-commit-id: c47653592a8a4e403361f71735d2286e03aa063c [formerly 5c5ab0f36c]
Former-commit-id: 88fe72c588
2014-07-17 15:41:38 -05:00