Commit graph

6259 commits

Author SHA1 Message Date
David Gillingham
040368ea54 Omaha #3389: Add ability for deploy-install.xml to run WA-specific deploy script for standalone components.
Change-Id: I39fe60ae80c8a62b9ed6052e353e314783bba999

Former-commit-id: afc28adc7a [formerly f9ca189dfc [formerly fc715e98a5] [formerly afc28adc7a [formerly 334cfcf418b0659b496088d7ac2b2f111cf8bc72]]]
Former-commit-id: f9ca189dfc [formerly fc715e98a5]
Former-commit-id: f9ca189dfc
Former-commit-id: 96f97f6b54
2014-07-15 16:00:46 -05:00
Roger Ferrel
b447b0d1ab Omaha #3344 Updated import for GRID_FILL_VALUE.
Former-commit-id: 88aa28c46b [formerly 8fdfb4b6e2 [formerly 3ce6447418] [formerly 88aa28c46b [formerly d490bc82905d37ad284485d30a493c1fd7e3ed6f]]]
Former-commit-id: 8fdfb4b6e2 [formerly 3ce6447418]
Former-commit-id: 8fdfb4b6e2
Former-commit-id: d989718a09
2014-07-14 17:01:32 -05:00
Steve Harris
ab770c03d7 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 4df5ae5a60 [formerly 27b08f8bcd [formerly 0cb8d202f5] [formerly 4df5ae5a60 [formerly f352b47e1d930bfe2bc46f956c781375881e41f9]]]
Former-commit-id: 27b08f8bcd [formerly 0cb8d202f5]
Former-commit-id: 27b08f8bcd
Former-commit-id: 42123642eb
2014-07-14 11:54:53 -05:00
Nate Jensen
445ac53a22 Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
Former-commit-id: 9f58d2e08b [formerly a55162c74b [formerly 2531649c55] [formerly 9f58d2e08b [formerly 97a0d0d8be7dd87e472dc0422a68df94d43095e1]]]
Former-commit-id: a55162c74b [formerly 2531649c55]
Former-commit-id: a55162c74b
Former-commit-id: a67b7a3005
2014-07-14 11:15:01 -05:00
Brian Clements
ac70d5ff31 Omaha #3371 all subprocesses now killed when cave.sh is killed
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2

Former-commit-id: ae5fa893a9 [formerly 0973e5ac41 [formerly 7e70fbda27] [formerly ae5fa893a9 [formerly e4becce5325aad266fd93548d27e5e122b145011]]]
Former-commit-id: 0973e5ac41 [formerly 7e70fbda27]
Former-commit-id: 0973e5ac41
Former-commit-id: d6e181d301
2014-07-14 08:05:18 -05:00
Richard Peter
65df97cdfa Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
Former-commit-id: 1c40dc11ef [formerly 88419fb8f3 [formerly 0222a89cd4] [formerly 1c40dc11ef [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]
Former-commit-id: 88419fb8f3 [formerly 0222a89cd4]
Former-commit-id: 88419fb8f3
Former-commit-id: 90d2108293
2014-07-11 17:46:14 -05:00
Benjamin Phillippe
5c606a44b6 Omaha #3379 Removing DWR
Former-commit-id: 4e1d93abf8 [formerly cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: cc9e9b427a [formerly d110e8428b]
Former-commit-id: cc9e9b427a
Former-commit-id: e613cb932e
2014-07-11 11:56:44 -05:00
Brian Clements
a39c8b7916 Omaha #3364 added jmap -heap to capture script
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153

Former-commit-id: d5506736df [formerly 146318e49e [formerly 82cf017cbe] [formerly d5506736df [formerly 65c88529acfb31c408777337f456da5dce879146]]]
Former-commit-id: 146318e49e [formerly 82cf017cbe]
Former-commit-id: 146318e49e
Former-commit-id: f24c94b118
2014-07-11 10:20:48 -05:00
Richard Peter
1874d4ec86 Merge "Omaha #3318 Delta script for GEFS h5 file updates" into omaha_14.4.1
Former-commit-id: 98d7cbab0d [formerly 57318e4446 [formerly c3740f0f11] [formerly 98d7cbab0d [formerly b5d7d388acb17911b4592182884ac8bfac687c4f]]]
Former-commit-id: 57318e4446 [formerly c3740f0f11]
Former-commit-id: 57318e4446
Former-commit-id: e84e988c7d
2014-07-10 17:47:50 -05:00
Nate Jensen
c6dc6c6ff5 Merge "Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh" into omaha_14.4.1
Former-commit-id: f92d9eb817 [formerly 205b90cb24 [formerly 68170f4a3e] [formerly f92d9eb817 [formerly c114f3578804f9eb2fd130428bb327c968f0fbdf]]]
Former-commit-id: 205b90cb24 [formerly 68170f4a3e]
Former-commit-id: 205b90cb24
Former-commit-id: abd06c4d76
2014-07-10 17:02:48 -05:00
Nate Jensen
1cdb318608 Merge "Omaha #3165 update manifests for ll.netcdf rename" into omaha_14.4.1
Former-commit-id: b267109497 [formerly c3e7b245af [formerly ffa31a72ab] [formerly b267109497 [formerly 599f7a6d2eff8723cbf515b14afefc270f42cdd0]]]
Former-commit-id: c3e7b245af [formerly ffa31a72ab]
Former-commit-id: c3e7b245af
Former-commit-id: a19c2dde43
2014-07-10 16:32:02 -05:00
Brian Clements
d6c9768385 Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298

Former-commit-id: 0113e109d3 [formerly 987d514fa3 [formerly 871a8655c8] [formerly 0113e109d3 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]
Former-commit-id: 987d514fa3 [formerly 871a8655c8]
Former-commit-id: 987d514fa3
Former-commit-id: ed03db05ea
2014-07-10 16:31:11 -05:00
Roger Ferrel
26fcb4b9aa Omaha #3318 Delta script for GEFS h5 file updates
Former-commit-id: 9eaeb01624 [formerly 577790589f [formerly d007725e9a] [formerly 9eaeb01624 [formerly 2e6eeaeac3018a34bf5a471f4ebcae58e608fbca]]]
Former-commit-id: 577790589f [formerly d007725e9a]
Former-commit-id: 577790589f
Former-commit-id: c9601b1194
2014-07-10 16:30:03 -05:00
Everett Kladstrup
1f9e1575a9 Omaha #3165 update manifests for ll.netcdf rename
Former-commit-id: febe13a241 [formerly 9cf007e546 [formerly 4e3b76ae29] [formerly febe13a241 [formerly 434ab5131e44d772d04c029833e2979fc19b6421]]]
Former-commit-id: 9cf007e546 [formerly 4e3b76ae29]
Former-commit-id: 9cf007e546
Former-commit-id: 4abb66a103
2014-07-10 16:19:42 -05:00
Bryan Kowal
34da4d3e55 Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.


Former-commit-id: 49ffec76ff [formerly 32aa07f1fc [formerly 984842331d] [formerly 49ffec76ff [formerly 146e5ebed335bf25cbae152eef1b0544e833f741]]]
Former-commit-id: 32aa07f1fc [formerly 984842331d]
Former-commit-id: 32aa07f1fc
Former-commit-id: 7220057d30
2014-07-10 11:16:19 -05:00
Nate Jensen
81e7660a82 Omaha #3165 fix bad manifests
Change-Id: I9cef6a2086a7688fa5db412073af2b565396958a

Former-commit-id: eef97e7ec0 [formerly b874c80f93 [formerly c323b72f48] [formerly eef97e7ec0 [formerly 4792e114d091b244b46d54b0846b8535583e4068]]]
Former-commit-id: b874c80f93 [formerly c323b72f48]
Former-commit-id: b874c80f93
Former-commit-id: 61fa1f41f0
2014-07-10 09:20:24 -05:00
Ron Anderson
7c78d28a95 Issue #3146 Added check for duplicate smartInit.
Added alertViz message for GFE site activation failure

Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004

Former-commit-id: 468668e19b [formerly 9f4e89347a [formerly 0c0739bd72] [formerly 468668e19b [formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]]
Former-commit-id: 9f4e89347a [formerly 0c0739bd72]
Former-commit-id: 9f4e89347a
Former-commit-id: 6ead047f79
2014-07-09 16:42:43 -05:00
Brian Clements
03a36d8626 Omaha #3214 fixed cache object usage in lightning resource
pulse and cloud flashes were not updated properly in the cache

Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486

Former-commit-id: ac8f861112 [formerly dba1fb3fc1 [formerly 994226e82b] [formerly ac8f861112 [formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]]
Former-commit-id: dba1fb3fc1 [formerly 994226e82b]
Former-commit-id: dba1fb3fc1
Former-commit-id: fc246aa082
2014-07-09 14:13:47 -05:00
Nate Jensen
70dcfa3c6e Merge "Omaha #3361 reduce number of extraneous localization requests at GFE startup" into omaha_14.4.1
Former-commit-id: 2a18111bdc [formerly 011089ab35 [formerly 9f7aef5f3e] [formerly 2a18111bdc [formerly 56263f9c5dbc38d838e8da5df252ba5043f846ab]]]
Former-commit-id: 011089ab35 [formerly 9f7aef5f3e]
Former-commit-id: 011089ab35
Former-commit-id: c3619bf0e6
2014-07-09 09:47:07 -05:00
Nate Jensen
dcfb7f5421 Omaha #3361 reduce number of extraneous localization requests at GFE
startup

Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed

Former-commit-id: 5547ea1c7d [formerly c3bd61a2c0 [formerly 0c397d2b7e] [formerly 5547ea1c7d [formerly efa10ca2702ecee4535711be06373e5d079ac117]]]
Former-commit-id: c3bd61a2c0 [formerly 0c397d2b7e]
Former-commit-id: c3bd61a2c0
Former-commit-id: 93012a8b76
2014-07-09 09:24:31 -05:00
Nate Jensen
8b8665ac71 Merge "Omaha #3357 Ingest JVM shouldn't pull in DPA beans Change-Id: I59d0cf13a7704499093b401328bda5867197c525" into omaha_14.4.1
Former-commit-id: b9b26f1b54 [formerly c818bca5c3 [formerly 25f5e8f2e0] [formerly b9b26f1b54 [formerly a1a17c4757be0a60d6634384e5de1cbfd611096d]]]
Former-commit-id: c818bca5c3 [formerly 25f5e8f2e0]
Former-commit-id: c818bca5c3
Former-commit-id: a226c1fde5
2014-07-08 13:29:37 -05:00
Dave Hladky
754fa3556e Omaha #3357 Ingest JVM shouldn't pull in DPA beans
Change-Id: I59d0cf13a7704499093b401328bda5867197c525

Former-commit-id: a0d305355b [formerly 36b0428ff9 [formerly 53f26636f7] [formerly a0d305355b [formerly 4a5e3dc51e01bfb1fa6c50df7ba4f1a65bac9ba1]]]
Former-commit-id: 36b0428ff9 [formerly 53f26636f7]
Former-commit-id: 36b0428ff9
Former-commit-id: 8434edf807
2014-07-08 12:29:04 -05:00
Bryan Kowal
f6a0d47fbd Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
Former-commit-id: 6a197f845d [formerly 58a2ae8bc8 [formerly 98a310f4a7] [formerly 6a197f845d [formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]]
Former-commit-id: 58a2ae8bc8 [formerly 98a310f4a7]
Former-commit-id: 58a2ae8bc8
Former-commit-id: ee4b7c4ee8
2014-07-08 09:31:21 -05:00
Brian Clements
533820d968 Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing

Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6

Former-commit-id: da53d9ccc7 [formerly aeb093ad95 [formerly 0d4cd4bab8] [formerly da53d9ccc7 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]
Former-commit-id: aeb093ad95 [formerly 0d4cd4bab8]
Former-commit-id: aeb093ad95
Former-commit-id: c024dd86a1
2014-07-07 12:29:12 -05:00
Richard Peter
bb198ce76b Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
Former-commit-id: 8c17e9cef2 [formerly 4219dbeec8 [formerly ba1bd20407] [formerly 8c17e9cef2 [formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]
Former-commit-id: 4219dbeec8 [formerly ba1bd20407]
Former-commit-id: 4219dbeec8
Former-commit-id: 1dca75e12d
2014-07-07 09:39:28 -05:00
Richard Peter
04954f9fbc Merge "Omaha #3350 Removing OBE classes/files for registry user registry and identity management" into omaha_14.4.1
Former-commit-id: 98d82de231 [formerly 8a5608d851 [formerly a50a5b1663] [formerly 98d82de231 [formerly 0312ae103ee4dedea47c9ede9bb5651629e5a5b9]]]
Former-commit-id: 8a5608d851 [formerly a50a5b1663]
Former-commit-id: 8a5608d851
Former-commit-id: 16e6f93285
2014-07-07 09:21:02 -05:00
Brian Clements
7205488e68 Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e

Former-commit-id: e4c9a13adb [formerly c3a25024ae [formerly bfd9f59de8] [formerly e4c9a13adb [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]
Former-commit-id: c3a25024ae [formerly bfd9f59de8]
Former-commit-id: c3a25024ae
Former-commit-id: aad63c257d
2014-07-03 15:11:48 -05:00
Benjamin Phillippe
d0cfe0b25e Omaha #3350 Removing OBE classes/files for registry user registry and identity management
Former-commit-id: 7960578e2c [formerly c6c2f9240e [formerly ba0472caad] [formerly 7960578e2c [formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]]]
Former-commit-id: c6c2f9240e [formerly ba0472caad]
Former-commit-id: c6c2f9240e
Former-commit-id: 804a11f0f5
2014-07-03 12:53:22 -05:00
Nate Jensen
439716f041 Omaha #3165 fix grib logging imports
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021

Former-commit-id: 063ccb25e6 [formerly e101d99ba2 [formerly bd46c43240] [formerly 063ccb25e6 [formerly 12665e265f8490101099f96a84240b478e6f5a5f]]]
Former-commit-id: e101d99ba2 [formerly bd46c43240]
Former-commit-id: e101d99ba2
Former-commit-id: 76850794d6
2014-07-03 11:07:41 -05:00
Roger Ferrel
8da1a9d1ef Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e

Former-commit-id: 1869745cce [formerly 2723c92167 [formerly 02d9609862] [formerly 1869745cce [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]
Former-commit-id: 2723c92167 [formerly 02d9609862]
Former-commit-id: 2723c92167
Former-commit-id: b56fe77cbf
2014-07-02 14:27:28 -05:00
Brian Clements
bd406e27e7 Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc

Former-commit-id: 2773cf8935 [formerly fdec99abc5 [formerly 013292ce9d] [formerly 2773cf8935 [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]
Former-commit-id: fdec99abc5 [formerly 013292ce9d]
Former-commit-id: fdec99abc5
Former-commit-id: 92be869624
2014-07-02 14:20:10 -05:00
Richard Peter
82f11c2cf4 Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
Former-commit-id: 27ba905947 [formerly 9c41b7c23e [formerly 59325cf1f1] [formerly 27ba905947 [formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]]
Former-commit-id: 9c41b7c23e [formerly 59325cf1f1]
Former-commit-id: 9c41b7c23e
Former-commit-id: 1c07ac97d1
2014-07-02 11:51:26 -05:00
Nate Jensen
c51db2ec1c Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
Former-commit-id: 14b514df2c [formerly e193fe4719 [formerly 324194117a] [formerly 14b514df2c [formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]]
Former-commit-id: e193fe4719 [formerly 324194117a]
Former-commit-id: e193fe4719
Former-commit-id: 0031f7adf5
2014-07-02 11:20:26 -05:00
Nate Jensen
2ddd823a0a Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49

Former-commit-id: 74e2bd1670 [formerly 15d6ff7f79 [formerly f6cbccdc5c] [formerly 74e2bd1670 [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]
Former-commit-id: 15d6ff7f79 [formerly f6cbccdc5c]
Former-commit-id: 15d6ff7f79
Former-commit-id: a38a776ac6
2014-07-02 11:18:59 -05:00
Brian Clements
6e01a1ac51 Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f

Former-commit-id: eac871eed7 [formerly 08724fefd7 [formerly 8b5ad1ec33] [formerly eac871eed7 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]
Former-commit-id: 08724fefd7 [formerly 8b5ad1ec33]
Former-commit-id: 08724fefd7
Former-commit-id: 6c381d53ed
2014-07-02 10:02:52 -05:00
Nate Jensen
72ffe07428 Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372

Former-commit-id: 765ac1258b [formerly 1373af3e55 [formerly a93af621d8] [formerly 765ac1258b [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]
Former-commit-id: 1373af3e55 [formerly a93af621d8]
Former-commit-id: 1373af3e55
Former-commit-id: 6f28f24afa
2014-07-02 10:01:05 -05:00
Nate Jensen
c7d4332bdf Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4

Former-commit-id: f32bf19eb7 [formerly a16d8689e9 [formerly f10efa300c] [formerly f32bf19eb7 [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]
Former-commit-id: a16d8689e9 [formerly f10efa300c]
Former-commit-id: a16d8689e9
Former-commit-id: d873599954
2014-07-01 17:37:08 -05:00
Richard Peter
a4ddb89994 Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
Former-commit-id: 8dfa9696af [formerly 57ec1df5a5 [formerly b8f2fddd95] [formerly 8dfa9696af [formerly 956c4d9672e8706774d00f58e42b848c9917eb9f]]]
Former-commit-id: 57ec1df5a5 [formerly b8f2fddd95]
Former-commit-id: 57ec1df5a5
Former-commit-id: 03290f682e
2014-07-01 16:03:36 -05:00
Richard Peter
c1f1cbc0cf Omaha 3300 Fix merge issue in gfe-spring.xml
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea

Former-commit-id: eacaf068a7 [formerly b38dd722be [formerly 40c01d05d4] [formerly eacaf068a7 [formerly 59bf1aba9614d3206eb5e3d02d985d726a5c9fbe]]]
Former-commit-id: b38dd722be [formerly 40c01d05d4]
Former-commit-id: b38dd722be
Former-commit-id: 003689101c
2014-07-01 15:43:46 -05:00
Richard Peter
94dfb1d2b8 Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: 8ecc27f714 [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 6636b301e5 [formerly 93bbd98cbc]
Former-commit-id: 6636b301e5
Former-commit-id: ed38bf2372
2014-07-01 15:34:39 -05:00
Roger Ferrel
43c21dcaa5 Omaha #3230 Recursive search for model files.
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49

Former-commit-id: a8c93f7783 [formerly 69fab4d289 [formerly cd3720035d] [formerly a8c93f7783 [formerly c4009c2b4e19c5c1d65a1844c12a7e63e9366b9b]]]
Former-commit-id: 69fab4d289 [formerly cd3720035d]
Former-commit-id: 69fab4d289
Former-commit-id: 3c2a477f46
2014-07-01 15:33:30 -05:00
Steve Harris
bbcae6e52b Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 30cdbff7f8 [formerly f68e051938 [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]]]
Former-commit-id: f68e051938 [formerly 1c8dc56d49]
Former-commit-id: f68e051938
Former-commit-id: 6a7aeb3557
2014-07-01 13:38:18 -05:00
Nate Jensen
ea5067f614 Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: 1183c0538e [formerly 81ca7a9e9f [formerly c0d36e9a69] [formerly 1183c0538e [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]]
Former-commit-id: 81ca7a9e9f [formerly c0d36e9a69]
Former-commit-id: 81ca7a9e9f
Former-commit-id: 71025bcc3d
2014-07-01 10:30:54 -05:00
Nate Jensen
6ce9aa0a28 Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
Former-commit-id: fbda7c4489 [formerly ac0f0e2298 [formerly 0a9fc691b9] [formerly fbda7c4489 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]
Former-commit-id: ac0f0e2298 [formerly 0a9fc691b9]
Former-commit-id: ac0f0e2298
Former-commit-id: 479b22f6a1
2014-07-01 10:22:25 -05:00
Greg Armendariz
29b87e136e Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
Former-commit-id: 0688e9db1b [formerly 134f0e2e8b [formerly 82fe8608e0] [formerly 0688e9db1b [formerly e6a5ab99510887f28c4a98afaa28f122f814d5a5]]]
Former-commit-id: 134f0e2e8b [formerly 82fe8608e0]
Former-commit-id: 134f0e2e8b
Former-commit-id: 80fd17a8c2
2014-07-01 10:17:11 -05:00
Nate Jensen
c72961d063 Merge "Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range." into omaha_14.4.1
Former-commit-id: 1d2ae81ff6 [formerly 3b2dc2915e [formerly 35e3626527] [formerly 1d2ae81ff6 [formerly 76fd0a563baa40722ce645d8019c40dbc42405b6]]]
Former-commit-id: 3b2dc2915e [formerly 35e3626527]
Former-commit-id: 3b2dc2915e
Former-commit-id: 049450c5a9
2014-07-01 10:12:14 -05:00
Steve Harris
b2ca44adc7 Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: 7acd9ab2dd [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 2f2958df37 [formerly d4dc1723c1]
Former-commit-id: 2f2958df37
Former-commit-id: 741dc31fcb
2014-07-01 11:08:46 -04:00
Richard Peter
8ec0cec3d0 Merge "Omaha #3255 Updated Proxy classes to include all java proxy config settings" into omaha_14.4.1
Former-commit-id: e7d0dd1e28 [formerly 838739ebbb [formerly 027fff1de0] [formerly e7d0dd1e28 [formerly 33080d565ceb85a0a0945f7c0d6a81caaa715b62]]]
Former-commit-id: 838739ebbb [formerly 027fff1de0]
Former-commit-id: 838739ebbb
Former-commit-id: a15a86a911
2014-07-01 10:02:57 -05:00
Richard Peter
feb82e79d9 Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: e6ac1b2ec8 [formerly 20eeb493bb [formerly 6d9db0784a] [formerly e6ac1b2ec8 [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]]
Former-commit-id: 20eeb493bb [formerly 6d9db0784a]
Former-commit-id: 20eeb493bb
Former-commit-id: 1024035422
2014-07-01 09:48:20 -05:00
Nathan Bowler
2847cd3cb8 Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range.
Change-Id: I63681d5172689711834f3d71df9424c68a1f5317

Former-commit-id: 6099815272 [formerly f3fc00fb32 [formerly 43f164e682] [formerly 6099815272 [formerly 2d389525e2897237a66eb145002a9ae8970c9993]]]
Former-commit-id: f3fc00fb32 [formerly 43f164e682]
Former-commit-id: f3fc00fb32
Former-commit-id: 7908a8a361
2014-07-01 09:19:15 -04:00