Commit graph

5587 commits

Author SHA1 Message Date
Richard Peter
6a7d86d00a Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: 0c5da56070 [formerly c7f5b23633] [formerly 25fd0e03f4] [formerly 25fd0e03f4 [formerly 4056f53fa2]] [formerly a4fb460e17 [formerly 25fd0e03f4 [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]]
Former-commit-id: a4fb460e17
Former-commit-id: cc311d12cb55e8b1f47eb0fbf8c5af41fe767d8b [formerly 38c78f7ac3ebdff8190b01723125c22a2058c85f] [formerly f364f02f58 [formerly c3c7ebb146]]
Former-commit-id: f364f02f58
Former-commit-id: 3297632b5d
2014-05-01 14:47:41 -05:00
Steve Harris
1447eb1d6b Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 013997c523 [formerly d2905e51d4] [formerly 9ecd871825] [formerly 9ecd871825 [formerly c8ba70a146]] [formerly 779e85cc77 [formerly 9ecd871825 [formerly c8ba70a146] [formerly 779e85cc77 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]]
Former-commit-id: 779e85cc77
Former-commit-id: 1ddd5311e1debbf0aa90e73f7a5360a9b084915f [formerly bf130d4e15490de77c6bbdbae09ac7d93618c08a] [formerly 9a6ab8c52f [formerly bdf6d0b6be]]
Former-commit-id: 9a6ab8c52f
Former-commit-id: 9a268173ac
2014-05-01 13:25:15 -05:00
Nate Jensen
8e0208696d Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: 266cfdd416 [formerly dba33e281e] [formerly ba9ed2aba3] [formerly ba9ed2aba3 [formerly b7536a398b]] [formerly 96071c250d [formerly ba9ed2aba3 [formerly b7536a398b] [formerly 96071c250d [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]]
Former-commit-id: 96071c250d
Former-commit-id: e58ce5b427c4cecd48ba62eb315b672cd55e79a1 [formerly 88095fd377297b348e1d0c64c9215b50da8eef27] [formerly dbca36c2bc [formerly 4c2923246a]]
Former-commit-id: dbca36c2bc
Former-commit-id: c617423fd7
2014-05-01 12:40:41 -05:00
Brian Clements
83b687ba62 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: 788188a7dc [formerly eae19ec5ca] [formerly 93912625ea] [formerly 93912625ea [formerly 3ca4f8cc52]] [formerly dd5412e119 [formerly 93912625ea [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]]
Former-commit-id: dd5412e119
Former-commit-id: 3695d8826fc13b31caea68f8dff7bc9c1b2128b3 [formerly f6d182158a5782516e8b761f409c187bb4622b1d] [formerly 3fd504f1de [formerly 2337d5ef56]]
Former-commit-id: 3fd504f1de
Former-commit-id: 8fc0feed89
2014-05-01 12:34:09 -05:00
Bryan Kowal
2a2bbbee01 Issue #3099 - handle empty location name lists in the data request
Former-commit-id: abfff86471 [formerly dfd5e3dbad] [formerly ff21ef813c] [formerly ff21ef813c [formerly 5eac78f0e0]] [formerly a9b9a8b8c4 [formerly ff21ef813c [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 8713bed862f9fab0319f8c692cac5eb4c35f6309 [formerly 766f5d140cfb513aced9899ffa7b673d5595123d] [formerly 4775dc1f40 [formerly 2079aec2bb]]
Former-commit-id: 4775dc1f40
Former-commit-id: 5267bae3dd
2014-05-01 12:12:42 -05:00
Nate Jensen
1e1d36666d Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: 1a1253d6de [formerly b911f3e9b5] [formerly 1d157a16e3] [formerly 1d157a16e3 [formerly 7fbdb9ff83]] [formerly bcb82bedc6 [formerly 1d157a16e3 [formerly 7fbdb9ff83] [formerly bcb82bedc6 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]]]
Former-commit-id: bcb82bedc6
Former-commit-id: 04b30926002d3886fd7982260fb7c1d62d5c2eb9 [formerly 793328ce1c59c6fb48e922f66fcf2785e57bd487] [formerly 037fe502d7 [formerly e5eb1ab87e]]
Former-commit-id: 037fe502d7
Former-commit-id: 8ae67e0d7f
2014-05-01 12:06:13 -05:00
Nate Jensen
137b665eea Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
Former-commit-id: 5db5974b59 [formerly 97ea9dd708] [formerly 03b412c136] [formerly 03b412c136 [formerly b28e5291d6]] [formerly 244183db25 [formerly 03b412c136 [formerly b28e5291d6] [formerly 244183db25 [formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]]]
Former-commit-id: 244183db25
Former-commit-id: 6b33a3f5c077aae121c1d898281ef489335fe6db [formerly d915e1041f3582440bb6f108021a9ffb531db781] [formerly 59623a97d0 [formerly 02059a512f]]
Former-commit-id: 59623a97d0
Former-commit-id: c7610d0a3a
2014-05-01 11:21:54 -05:00
Nate Jensen
774efb4db4 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: 41cfcbdd47 [formerly fc261ab303] [formerly 7b2ed421f0] [formerly 7b2ed421f0 [formerly 2a0775e748]] [formerly 76ad31501b [formerly 7b2ed421f0 [formerly 2a0775e748] [formerly 76ad31501b [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]]
Former-commit-id: 76ad31501b
Former-commit-id: 35e284aff1d6091ab31f69c4946858e16e8151f5 [formerly cf11210c48f3e873f15155bc8644fb9af1296446] [formerly ffb294cab4 [formerly 191f6c3385]]
Former-commit-id: ffb294cab4
Former-commit-id: 3634889dab
2014-05-01 11:01:37 -05:00
Dave Hladky
04b310d40e Issue #2992 Missed perl script
Former-commit-id: 67f2c9f1da [formerly f844c98853] [formerly 9a43ac36e6] [formerly 9a43ac36e6 [formerly 23433f628d]] [formerly 904a608495 [formerly 9a43ac36e6 [formerly 23433f628d] [formerly 904a608495 [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]]]
Former-commit-id: 904a608495
Former-commit-id: 6af509699cf091b95d68b8813e0fcd6e86208ce0 [formerly d66d8ebcef31eae8a5b0eefbe03af2d980e7f476] [formerly bc4067c5d8 [formerly dbe4f68100]]
Former-commit-id: bc4067c5d8
Former-commit-id: 76c963b690
2014-05-01 08:48:38 -05:00
Greg Armendariz
953cad233b Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: c449eec5b0 [formerly fece69eb09] [formerly 2994753636] [formerly 2994753636 [formerly 1e48076fb2]] [formerly 58eaf444bd [formerly 2994753636 [formerly 1e48076fb2] [formerly 58eaf444bd [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]]
Former-commit-id: 58eaf444bd
Former-commit-id: dc768b0ae3d4822aab8b190f0d9b525aa111888e [formerly ac1328cf7911a36196114732a8d00e8c762670a8] [formerly 9f6eff005b [formerly e1d91769fe]]
Former-commit-id: 9f6eff005b
Former-commit-id: 72793f2c24
2014-04-30 19:34:43 -05:00
Brian Clements
49fdf12dd6 Issue #2903 set commons.lang to unpack in feature to fix odd bug
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help


Former-commit-id: 9f3310b1ca [formerly fe53a23d2c] [formerly fee0a858cb] [formerly fee0a858cb [formerly 873efa1c64]] [formerly f45e435f2c [formerly fee0a858cb [formerly 873efa1c64] [formerly f45e435f2c [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]]
Former-commit-id: f45e435f2c
Former-commit-id: 5d62ca5a5256c0511ed2feda009fe31d6cc6b559 [formerly f9367f0487bc002acf5cc3b4733af6b6d9b49a24] [formerly 20830253ba [formerly c187523782]]
Former-commit-id: 20830253ba
Former-commit-id: 00e7061f42
2014-04-30 17:52:43 -05:00
Richard Peter
111e900b6b Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 949c1f2c69 [formerly 83658fcbb5] [formerly d28c4fdbae] [formerly d28c4fdbae [formerly de9eb60629]] [formerly 86ddd480c1 [formerly d28c4fdbae [formerly de9eb60629] [formerly 86ddd480c1 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]]
Former-commit-id: 86ddd480c1
Former-commit-id: a60fddd171b7f961bce26ab38932bf7849f67035 [formerly 75220412d93558970dc725fce5312cce7866166d] [formerly d961ff6edc [formerly 6ecb5018b6]]
Former-commit-id: d961ff6edc
Former-commit-id: 9ee5b7c648
2014-04-30 17:43:50 -05:00
Greg Armendariz
c2360ad26a Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1
Former-commit-id: d1a1dfeaa8 [formerly b26f22f40d] [formerly 95612236c5] [formerly 95612236c5 [formerly 4d76163f10]] [formerly 0354c9ad26 [formerly 95612236c5 [formerly 4d76163f10] [formerly 0354c9ad26 [formerly a93dfbbea0f33fae158cbb1339293334dec0a2c3]]]]
Former-commit-id: 0354c9ad26
Former-commit-id: cc7169901ed189870901009a640bf7a4447e9595 [formerly 5c1c755203c9c48c97d59a8a8fb8e6bca26926d5] [formerly c5760afb93 [formerly 8b477dfc39]]
Former-commit-id: c5760afb93
Former-commit-id: 14b88d1dfd
2014-04-30 17:42:26 -05:00
Dave Hladky
1174c27f8c Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: fcb80a2b11 [formerly a14cb8c45f] [formerly e2a4bb6755] [formerly e2a4bb6755 [formerly c352643c79]] [formerly 3b00ae03cc [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 7a0ec71e79da5fa2b51e6043955d28c246d5ea12 [formerly 271120a82cffba35438f0b9830c3a47c736fcb73] [formerly ea791b5ca5 [formerly bf42c8d740]]
Former-commit-id: ea791b5ca5
Former-commit-id: 5fc17cf3b8
2014-04-30 17:38:28 -05:00
Brian Clements
263f509786 Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: dd9810ab2e [formerly b3825b8032] [formerly e49d150332] [formerly e49d150332 [formerly 57f5ac701c]] [formerly 1273846844 [formerly e49d150332 [formerly 57f5ac701c] [formerly 1273846844 [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]]]
Former-commit-id: 1273846844
Former-commit-id: 2be124a114697cf4084a97add0a4721d40fb1e99 [formerly dfe08f3eccdfa7204ab4aa439b2e37da97873ec7] [formerly 9fc8796247 [formerly a074b27951]]
Former-commit-id: 9fc8796247
Former-commit-id: fc004a1db8
2014-04-30 16:41:14 -05:00
Greg Armendariz
17853714c3 Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: fe825c5888 [formerly 239ce27244] [formerly 4c245da2a2] [formerly 4c245da2a2 [formerly 4981b6a438]] [formerly 2d38c69ac1 [formerly 4c245da2a2 [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: 0fb32fe9fa90ea98c30dff9ceb9f919985650750 [formerly 9e10990e64fcefc2ae835d7e6bae34e0905df35d] [formerly 94a55e5c31 [formerly 784235ab9f]]
Former-commit-id: 94a55e5c31
Former-commit-id: b069ee1ea3
2014-04-30 15:42:42 -05:00
Nate Jensen
9ea86df9e8 Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: c2b2368e2e [formerly 580a95ed41] [formerly f6f9169aef] [formerly f6f9169aef [formerly 1eade4f434]] [formerly f005d2f31c [formerly f6f9169aef [formerly 1eade4f434] [formerly f005d2f31c [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]]
Former-commit-id: f005d2f31c
Former-commit-id: 0d256e0d83fc03c5c9e021c2933afa99cfc515ae [formerly 32bb783c21f96ad95b5837b59bfa30c95ba65a23] [formerly a6df4bd2b2 [formerly b98328113b]]
Former-commit-id: a6df4bd2b2
Former-commit-id: 299cb28462
2014-04-30 15:16:11 -05:00
Richard Peter
e7a6798293 Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 5258e3789e [formerly 9e9ff43e16] [formerly 37a5292083] [formerly 37a5292083 [formerly f80e16d0c9]] [formerly bfe46bb5e6 [formerly 37a5292083 [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly 31d75a4b82413b015353055668defab0095ef893]]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: 8004572f7cf493165c987f2cbcb1ddd1dfd4b38f [formerly e3670bef923e89a1f5a7985176c384fe933c5958] [formerly f2d07ce35c [formerly 8ddc4eaffd]]
Former-commit-id: f2d07ce35c
Former-commit-id: 307a149bea
2014-04-30 14:49:24 -05:00
Ben Steffensmeier
7ded3bdced Issue #2946 Fix auxillary purge rules.
Former-commit-id: 6eae400302 [formerly 8449ec8f22] [formerly bcc02476c6] [formerly bcc02476c6 [formerly 2850d80610]] [formerly 4c06cd6f5e [formerly bcc02476c6 [formerly 2850d80610] [formerly 4c06cd6f5e [formerly a62bdff82f96e79737269686598687ecef746c01]]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: 7fda3d1927b06841482284ea62b38db39eabcfcc [formerly a295c948db1f2e4e6f82577553e64171a8f2dc5a] [formerly 076165515a [formerly e51a0dcb13]]
Former-commit-id: 076165515a
Former-commit-id: 410b30ef15
2014-04-30 14:38:27 -05:00
Nate Jensen
354f663f15 Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 2c30a0d557 [formerly acfcaea04e] [formerly 2d19ee46e5] [formerly 2d19ee46e5 [formerly 8cbea21f32]] [formerly 9b19f95d24 [formerly 2d19ee46e5 [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 845dd4ba6a3b1171d35b9c4bb79d5aa349d310d2 [formerly 94b4ede51617e66b1e18ddaa60775457c6b2c3ad] [formerly 9a2c674142 [formerly a33ca4e3ac]]
Former-commit-id: 9a2c674142
Former-commit-id: 65ad418a94
2014-04-30 13:08:26 -05:00
Richard Peter
512f2bafcd Issue #2854: Reorganize deltaScripts
Former-commit-id: ad09921060 [formerly 46a94c88cd] [formerly 09f41a6b31] [formerly 09f41a6b31 [formerly 56745c942e]] [formerly c8e373c098 [formerly 09f41a6b31 [formerly 56745c942e] [formerly c8e373c098 [formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]]]
Former-commit-id: c8e373c098
Former-commit-id: ecacc56d4ab4d3d36508094699557db6ed8b916a [formerly d5d0bc708d2a84d887a8b1401a4d596af0a188e3] [formerly a526600e3e [formerly e1721cad00]]
Former-commit-id: a526600e3e
Former-commit-id: d25ceb8da7
2014-04-30 13:03:44 -05:00
Mike Duff
9b76996af3 Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: a4952ba394 [formerly 2b1116f380] [formerly 90895cf316] [formerly 90895cf316 [formerly 60bfadd865]] [formerly c0b2a19a2f [formerly 90895cf316 [formerly 60bfadd865] [formerly c0b2a19a2f [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: d5d5b17c60e5af1adfcf464f599ffafa228ab32f [formerly b8d16c9b3441a0ac07d22e0891f1c3ff651d8b8d] [formerly 1e84cb07c2 [formerly 0601068b03]]
Former-commit-id: 1e84cb07c2
Former-commit-id: e5572a5cd0
2014-04-30 10:17:56 -05:00
Richard Peter
bb1cea059e Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 69ad9440dc [formerly 15d4373fa5] [formerly 74b2cdfe34] [formerly 74b2cdfe34 [formerly 4ae87dcece]] [formerly 9dafb3b9e3 [formerly 74b2cdfe34 [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: d8b3262e98638e9dafabd3cd6eb68c1b28306f1e [formerly 87db6e727009d9903d97b834ac5727197c5c6117] [formerly f381290ed1 [formerly 9663a83d1f]]
Former-commit-id: f381290ed1
Former-commit-id: 3c2ff2733b
2014-04-29 16:14:52 -05:00
Ben Steffensmeier
2836977c8f Issue #3081 Use alias in derived paraemters less.
Former-commit-id: 7e83dc383d [formerly fe893aa216] [formerly fe5d69c896] [formerly fe5d69c896 [formerly 1d38fb2df1]] [formerly 60a7f64a5e [formerly fe5d69c896 [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: 9c62e26e81dd40cc6672ea500c654174032e7f44 [formerly 597f015753893b012533c8d051366fb27a6f6d18] [formerly f31d7f826b [formerly 539a32666b]]
Former-commit-id: f31d7f826b
Former-commit-id: 57f185dd72
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
bbe85e680f Issue #3080 add NaN conversion to Slice.py
Former-commit-id: fba5fb43fe [formerly 96ebfc4ae9] [formerly eb9a0398df] [formerly eb9a0398df [formerly 156c25fb9c]] [formerly 5959b17732 [formerly eb9a0398df [formerly 156c25fb9c] [formerly 5959b17732 [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]]
Former-commit-id: 5959b17732
Former-commit-id: f555c68d14ec19a9268b94b4fd5051fbf3f17b94 [formerly b1afe65ee8b094ce8f0e0dd9ca0140878d1a13d8] [formerly 8a1b16d15e [formerly ca8cd9fb43]]
Former-commit-id: 8a1b16d15e
Former-commit-id: 08442c513a
2014-04-29 15:35:29 -05:00
Roger Ferrel
4b51c10039 Issue #3036 Added check for archive's root directories.
Former-commit-id: b6ed02b260 [formerly fa703c0060] [formerly 039e4b5209] [formerly 039e4b5209 [formerly 7a2775ecbc]] [formerly 3259d4d44d [formerly 039e4b5209 [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]]
Former-commit-id: 3259d4d44d
Former-commit-id: d49d41d0fad8e693f31ed72fa93b3c61116959f5 [formerly c60f0141107a305c80631ce1cee234f0b2f3d1d4] [formerly 39f7eb1ecc [formerly f71aee1e36]]
Former-commit-id: 39f7eb1ecc
Former-commit-id: a447baa5a0
2014-04-29 14:15:11 -05:00
Brian Clements
35e4b04b74 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


Former-commit-id: 706fd745bc [formerly c0aef972af] [formerly abb14c67e7] [formerly abb14c67e7 [formerly 5beb3be2e8]] [formerly a1e416da97 [formerly abb14c67e7 [formerly 5beb3be2e8] [formerly a1e416da97 [formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]]]]
Former-commit-id: a1e416da97
Former-commit-id: 658ab6381751aa48c1d2ef6042bc0847020292be [formerly 1db57f8f23775052064fa72045bb94286cb51a8a] [formerly 9f1856a6f0 [formerly a2c0ba7f0b]]
Former-commit-id: 9f1856a6f0
Former-commit-id: ad5be1cf6a
2014-04-29 13:48:00 -05:00
Richard Peter
a0ffae6c6b Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 3d9938c5a3 [formerly 8b1a177110] [formerly 67683dd891] [formerly 67683dd891 [formerly 44b1782461]] [formerly 32957285fc [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: f7f2cdcc4b250524846ce9a4063e651d4182d7a2 [formerly 2a324b0264c6962014f41df55690c7e2b09955e1] [formerly 6966b79246 [formerly 80d4153878]]
Former-commit-id: 6966b79246
Former-commit-id: 0dfa8cc4c6
2014-04-28 16:27:40 -05:00
Lee Venable
579a45456b Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: d7bfa28cdb [formerly 761101dd50] [formerly a8ab7f3946] [formerly a8ab7f3946 [formerly 573465f316]] [formerly e054a7ab98 [formerly a8ab7f3946 [formerly 573465f316] [formerly e054a7ab98 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]]
Former-commit-id: e054a7ab98
Former-commit-id: 3d5604e344d0b12e9b7070a3e2f26ca4ffe2d4ec [formerly d8e463c70dce54bf7b40b1d218bccb587c3b88e6] [formerly eda26e6076 [formerly 43fdbe9ab6]]
Former-commit-id: eda26e6076
Former-commit-id: 090ea0fa5a
2014-04-28 15:24:26 -05:00
Ben Steffensmeier
c6f8d11535 Issue #2947 ensure consistent interpolation levels for derived satellite.
Former-commit-id: 139ce464f9 [formerly f4744737e4] [formerly 41b0c1a3c8] [formerly 41b0c1a3c8 [formerly 812eebdd72]] [formerly f318c9eb62 [formerly 41b0c1a3c8 [formerly 812eebdd72] [formerly f318c9eb62 [formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]]]
Former-commit-id: f318c9eb62
Former-commit-id: 2a25d08ef91daa50de04860e86ec1742f7e2cfb4 [formerly 78b9fa75af2953ddce6bfad5265e177fb5696833] [formerly bb562c9755 [formerly 868945fb1b]]
Former-commit-id: bb562c9755
Former-commit-id: e9bc29a18e
2014-04-28 13:00:39 -05:00
Nate Jensen
7105fbc7ef Merge "Issue #2972 fix thin client startup" into development
Former-commit-id: 0d4c4a6123 [formerly 99612f1324] [formerly d145961f4c] [formerly d145961f4c [formerly 48cab0ae71]] [formerly dc3ba942a9 [formerly d145961f4c [formerly 48cab0ae71] [formerly dc3ba942a9 [formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]]
Former-commit-id: dc3ba942a9
Former-commit-id: e62c04d03052243600793d843384e4ae1b306a5e [formerly e4462ad10f15d550cf3f5675a21220838cb4c684] [formerly 74e77d307a [formerly 11a3ae5054]]
Former-commit-id: 74e77d307a
Former-commit-id: 8830b4dc71
2014-04-25 15:05:07 -05:00
Richard Peter
83498e86fb Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: be500de80e [formerly dd3a378a6a] [formerly 5a0083987b] [formerly 5a0083987b [formerly 98b35d30c0]] [formerly b06172a798 [formerly 5a0083987b [formerly 98b35d30c0] [formerly b06172a798 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]]
Former-commit-id: b06172a798
Former-commit-id: 5dea62d9cdec707e1e2b6385edc6e7799f8302a8 [formerly 5bda710ce91c29365a5685d0cfa858a81e171800] [formerly c7882721b2 [formerly f5f6ff0008]]
Former-commit-id: c7882721b2
Former-commit-id: d45dae2155
2014-04-25 14:57:51 -05:00
Nate Jensen
0450e5ca82 Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: f716073008 [formerly 23487630e4] [formerly d425f134ae] [formerly d425f134ae [formerly 4842f08165]] [formerly 9a46583271 [formerly d425f134ae [formerly 4842f08165] [formerly 9a46583271 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]]
Former-commit-id: 9a46583271
Former-commit-id: 1744ed47aca9d6e960fff21d51c9d02ed45f77e5 [formerly 40b297f2098fb561c5a1c6c26494e2f2273f285a] [formerly 1d6014f363 [formerly acfc3c2b20]]
Former-commit-id: 1d6014f363
Former-commit-id: a847ecddfa
2014-04-25 14:57:47 -05:00
Richard Peter
5376d24b91 Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 88b9e87f82 [formerly 06d58b0472] [formerly 1781500740] [formerly 1781500740 [formerly 36742a30f3]] [formerly 6918dc0026 [formerly 1781500740 [formerly 36742a30f3] [formerly 6918dc0026 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]]
Former-commit-id: 6918dc0026
Former-commit-id: 41ecc08e9baf1b2a2406c7dff55371b2aa541347 [formerly e1f4de7e6f2ee07e043c48c470ad8d5b1a46686a] [formerly 433d5a77f6 [formerly 52e821b5bb]]
Former-commit-id: 433d5a77f6
Former-commit-id: 4e1a30b4d9
2014-04-25 14:53:22 -05:00
Nate Jensen
b4e8bd5bd3 Issue #3000 fix common.dataplugin.bufrmos manifest
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

Former-commit-id: e59b2abf56 [formerly bf46b40f6e] [formerly 3719815807] [formerly 3719815807 [formerly deda54488f]] [formerly ca2cc7f11d [formerly 3719815807 [formerly deda54488f] [formerly ca2cc7f11d [formerly c91c2477aeff207ff253bce22b4fea57a7172d5c]]]]
Former-commit-id: ca2cc7f11d
Former-commit-id: 5dcd792d4db9b65fc685b4a448998fe9423cc1e8 [formerly 81071d64de116e6f7c310d72f0fca7fcacb07ab3] [formerly 4b24593f10 [formerly 619af04a23]]
Former-commit-id: 4b24593f10
Former-commit-id: d4f4a1ab8c
2014-04-25 14:51:45 -05:00
Richard Peter
c6d4a87ef0 Issue #2629: Update capture to grab Xorg log files.
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d

Former-commit-id: e9e6937c79 [formerly fd0662eb07] [formerly 5fb2aef966] [formerly 5fb2aef966 [formerly de249decab]] [formerly 1cc7977b99 [formerly 5fb2aef966 [formerly de249decab] [formerly 1cc7977b99 [formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]]]]
Former-commit-id: 1cc7977b99
Former-commit-id: aa8e49935e7eae1ed780c4cac25f5382ba5fa2ee [formerly 8adb3a0a5795e22045a287892d0335d8c624a4fe] [formerly 3f66895529 [formerly 7e3d3f3093]]
Former-commit-id: 3f66895529
Former-commit-id: 76d5fc88e4
2014-04-25 14:42:53 -05:00
Nate Jensen
7bf87c3055 Issue #2972 fix thin client startup
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4

Former-commit-id: d36867e790 [formerly f007819a3b] [formerly 7811040f3e] [formerly 7811040f3e [formerly d47a09530a]] [formerly 86e9502341 [formerly 7811040f3e [formerly d47a09530a] [formerly 86e9502341 [formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]]
Former-commit-id: 86e9502341
Former-commit-id: 919af2462fa8dd24ddcca1052d08b3d4f3e9ae86 [formerly e06610b8bc72529769fa8960a6b7198bd30c2095] [formerly c802e6a05c [formerly 27ed7e5dab]]
Former-commit-id: c802e6a05c
Former-commit-id: c7a6389dc5
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
95906632b9 Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: f1de16a2f6 [formerly 214311cc6e] [formerly 9478f8adc9] [formerly 9478f8adc9 [formerly 2d96d9d2df]] [formerly fa3d4bb618 [formerly 9478f8adc9 [formerly 2d96d9d2df] [formerly fa3d4bb618 [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]]
Former-commit-id: fa3d4bb618
Former-commit-id: a1aea44f125ee46d07da91b8633e5da4f3d8ded7 [formerly 5a00a4836af355759bf8bd0c0ffa79adcb056d6b] [formerly 080c2a48f3 [formerly 7499987f52]]
Former-commit-id: 080c2a48f3
Former-commit-id: 5b61473bd6
2014-04-25 14:38:36 -05:00
Brian Clements
fb1a566a1f Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 7e778186fb [formerly 1dc13cc151] [formerly 5f746c9c56] [formerly 5f746c9c56 [formerly 17ab4f6184]] [formerly f1213c1bda [formerly 5f746c9c56 [formerly 17ab4f6184] [formerly f1213c1bda [formerly 57120491452b36bf15227bd4b6d0236221c71124]]]]
Former-commit-id: f1213c1bda
Former-commit-id: f56ed5364d852dfe6cdd1897095f165e01848f4c [formerly d5d66283e23493ee2ad0d94aaa29c13df24989de] [formerly ed2d66a6fa [formerly fe6af8c315]]
Former-commit-id: ed2d66a6fa
Former-commit-id: 922d56617f
2014-04-25 13:41:17 -05:00
Nate Jensen
21f16ce94c Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
Former-commit-id: d39ab2baf3 [formerly df22d06b21] [formerly 64a09dbdc6] [formerly 64a09dbdc6 [formerly cf6992073f]] [formerly 0a245df4f1 [formerly 64a09dbdc6 [formerly cf6992073f] [formerly 0a245df4f1 [formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]]]]
Former-commit-id: 0a245df4f1
Former-commit-id: 7b5c7b39f3866ea1545fe786ac67335b39f8f1b0 [formerly d69331f521630baa62047e3b82a9cc06c1b48071] [formerly 1e47f6f03a [formerly b67f0a616f]]
Former-commit-id: 1e47f6f03a
Former-commit-id: ef52d0db9b
2014-04-25 13:26:10 -05:00
Richard Peter
f23c30eeaa Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: 4f606b3302 [formerly 1395628200] [formerly 86d1ff9427] [formerly 86d1ff9427 [formerly 44701f31f2]] [formerly 5c0f9b5ba5 [formerly 86d1ff9427 [formerly 44701f31f2] [formerly 5c0f9b5ba5 [formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]]]]
Former-commit-id: 5c0f9b5ba5
Former-commit-id: 67e58fdc617214ac48a982117006c119173d1c25 [formerly 22e220f4dbde49d7ef5d1ef995a55d8c5ac54cff] [formerly baee58476f [formerly 60684de8b4]]
Former-commit-id: baee58476f
Former-commit-id: 947b9d7423
2014-04-25 13:07:59 -05:00
David Gillingham
0fc8930cbd Merge "Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE." into development
Former-commit-id: fb4c0fe073 [formerly de1a1853cc] [formerly 073a31bacf] [formerly 073a31bacf [formerly 56c6622207]] [formerly f32cf61f22 [formerly 073a31bacf [formerly 56c6622207] [formerly f32cf61f22 [formerly e18ad8fe1c14c098e33ef98e3eaeb319bc2d1b1a]]]]
Former-commit-id: f32cf61f22
Former-commit-id: 7760e5bbba296da0b6d8b1ec194fe4dbb4845243 [formerly 6ce8b978732007497f5d383e245538a0bb7dee8d] [formerly 28a1606df8 [formerly 78d5c99d63]]
Former-commit-id: 28a1606df8
Former-commit-id: 05e5630b3c
2014-04-25 12:24:52 -05:00
Nate Jensen
267c9b3983 Issue #2060 remove FFG post processor dependency on dataURI, other minor
cleanups

Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410

Former-commit-id: 61bbea67d8 [formerly a9f16fe45f] [formerly d9ad750a99] [formerly d9ad750a99 [formerly 7da49c00f5]] [formerly 74b3181107 [formerly d9ad750a99 [formerly 7da49c00f5] [formerly 74b3181107 [formerly b45cdd1a3f4742937b9085ca70d538ae724d6aab]]]]
Former-commit-id: 74b3181107
Former-commit-id: e94548ef62d16eeb60b7545edb9c8ca77321eae5 [formerly a8aa65177362b3434658cd408da84eccb363f5c0] [formerly f6f962691f [formerly d0dfb21b6e]]
Former-commit-id: f6f962691f
Former-commit-id: bcece2286a
2014-04-25 12:19:23 -05:00
Brian Clements
89e162f21c Issue #3079 update to lightning name will continue if it encounters invalid xml
Former-commit-id: e4a1209d00 [formerly 9d0b557dec] [formerly afdae7c2e1] [formerly afdae7c2e1 [formerly 3305aee692]] [formerly 98adf15cda [formerly afdae7c2e1 [formerly 3305aee692] [formerly 98adf15cda [formerly 07e7a0eaa6973a705d5fff1beb8ebcb553c172d0]]]]
Former-commit-id: 98adf15cda
Former-commit-id: a97d8dfeda77cc6f66c2acf5196aa89c4722eb6f [formerly ed0ac441e8aaedea6c613df0559967e9ce0fdded] [formerly 421461fbd8 [formerly 5ca56d292a]]
Former-commit-id: 421461fbd8
Former-commit-id: 89c1082c77
2014-04-25 11:04:00 -05:00
David Gillingham
e83ff8f0c7 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 4ab957c9cb [formerly 777456404b] [formerly c14497b1b7] [formerly c14497b1b7 [formerly 2426e463f7]] [formerly 6ca193b8e9 [formerly c14497b1b7 [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 3fcc7f5680edf8f705b1afad91352e8f08adfbb6 [formerly cc410719114014fd14ea4e485ad8351678818e80] [formerly 48bc49fd4b [formerly 2e8b8c6e86]]
Former-commit-id: 48bc49fd4b
Former-commit-id: 8db5524b3f
2014-04-25 10:56:43 -05:00
Brian.Dyke
3e80889eb6 Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	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
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 83727709c6 [formerly 362d882b40] [formerly f0b8ea5822] [formerly f0b8ea5822 [formerly fb1f5aa593]] [formerly 3524838f9f [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 7eb8ff57ff4d7d383497a38960663b90f905f7b8 [formerly bb5a7e713dac6962660d9c769971464b6792cb76] [formerly bf3758efa3 [formerly 029f5753ad]]
Former-commit-id: bf3758efa3
Former-commit-id: 14a63a19e1
2014-04-25 11:06:11 -04:00
Richard Peter
e17aefeae2 Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development
Former-commit-id: d9958f368a [formerly 1c3ef27a2e] [formerly 5b3ffb51b0] [formerly 5b3ffb51b0 [formerly 0b765efce0]] [formerly 225d95171c [formerly 5b3ffb51b0 [formerly 0b765efce0] [formerly 225d95171c [formerly 98e0a18741b559dff887db980d95965edf5f7cae]]]]
Former-commit-id: 225d95171c
Former-commit-id: dc88136e419eb56eced668adfc510b37cf9d77e6 [formerly 5b0d5aaeb3bc30824dd69cc2f33ba21d62369299] [formerly 7371d8ccdd [formerly 02d1cf94b0]]
Former-commit-id: 7371d8ccdd
Former-commit-id: 93f4506b56
2014-04-24 19:15:56 -05:00
Richard Peter
018372dba4 Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: 13f8dd9937 [formerly ee59a298eb] [formerly 5b14b22ee1] [formerly 5b14b22ee1 [formerly 37342cba87]] [formerly 9a7e1aa9b0 [formerly 5b14b22ee1 [formerly 37342cba87] [formerly 9a7e1aa9b0 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: 088f049cfdc392355e0c38a78557e61b2bad5f8f [formerly 0442d2b0ea886a8fa3e51c518e72f6a8bad19366] [formerly 2d1262e41f [formerly caccf6ca52]]
Former-commit-id: 2d1262e41f
Former-commit-id: d8950196fa
2014-04-24 19:11:50 -05:00
Nate Jensen
a5070257c9 Merge "Issue #2060 remove dependency on grid dataURI column from more of DAT" into development
Former-commit-id: 14d70f1111 [formerly 35ae8de300] [formerly 2a86a2652d] [formerly 2a86a2652d [formerly 9ea03a1b3b]] [formerly 9cea7f88fb [formerly 2a86a2652d [formerly 9ea03a1b3b] [formerly 9cea7f88fb [formerly c73204189b318fd3aed128535166f72c99739dba]]]]
Former-commit-id: 9cea7f88fb
Former-commit-id: 9aef2304dff88b9b048175a7439679a00f0553e9 [formerly 0e83070df6eb12a90963dab8b3fffa2d9093bdf7] [formerly 0cc6a6224d [formerly c86c100079]]
Former-commit-id: 0cc6a6224d
Former-commit-id: c716f15e1c
2014-04-24 18:20:27 -05:00
Lee Venable
827499eda4 Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
Former-commit-id: e325984786 [formerly 4583301be4] [formerly 15c9311c97] [formerly 15c9311c97 [formerly a511f8d4e7]] [formerly e7acb04432 [formerly 15c9311c97 [formerly a511f8d4e7] [formerly e7acb04432 [formerly 9762326cea40526042cd7f371d864a96abd63842]]]]
Former-commit-id: e7acb04432
Former-commit-id: f5faac6b095c72aa27dadd9f2b9492c447cc9264 [formerly 354ff82939ff9af3bda0b0549c79621918a220c7] [formerly ae333a34dc [formerly 20d563cd15]]
Former-commit-id: ae333a34dc
Former-commit-id: ae2a0c44df
2014-04-24 17:53:05 -05:00