Commit graph

5596 commits

Author SHA1 Message Date
Nate Jensen
ef530e538d Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly d6518bede1 [formerly e9b3041170 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]]
Former-commit-id: d6518bede1
Former-commit-id: dcbedcbbc0 [formerly e8e971d434] [formerly bd03fd08ecba17789cb90578917e1a4d7b88234a [formerly 8ee8937daf]]
Former-commit-id: 691f6074396a107be1d2cd9bbea9d5f5ba7b2d31 [formerly e8b7cec960]
Former-commit-id: 3eaaf56f8e
2014-05-05 09:45:11 -05:00
Richard Peter
ce48a0230e Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 132d63ac44 [formerly dc0b598fd4 [formerly 28b33188773001c34946464093319dc2a1117be9]]]]
Former-commit-id: 132d63ac44
Former-commit-id: 2507aaf753 [formerly 8e141a137a] [formerly c5d890d7b24b88a20dc8c01d92647c6864edfb22 [formerly 5314b412b4]]
Former-commit-id: ad8d5ade754f2f63500d72978fe455c4ad54fb06 [formerly b9351199b8]
Former-commit-id: 9326b9d125
2014-05-02 10:05:59 -05:00
Richard Peter
aa4e137fe6 Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
Former-commit-id: 39467f210d [formerly 6bb353a05d] [formerly 51ba60d62b] [formerly 39467f210d [formerly 6bb353a05d] [formerly 51ba60d62b] [formerly 24f1c7b385 [formerly 51ba60d62b [formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]]]
Former-commit-id: 24f1c7b385
Former-commit-id: 0dda5a7c40 [formerly 592e9171e1] [formerly f5cd6aa1d45daa261c05965acd4769b63f5b3227 [formerly 1f7e076018]]
Former-commit-id: e5558a5d7b030baee414180a9b43047e86f30a39 [formerly 28c8c6357a]
Former-commit-id: f34020dcc0
2014-05-02 10:05:29 -05:00
Richard Peter
6b93ff149a Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly d4a138c534 [formerly 478cedd3a3 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]]
Former-commit-id: d4a138c534
Former-commit-id: 4537e1276f [formerly 160ce06137] [formerly ca0cfca3ed26cc4f000b74ac3d1f482f80140ed2 [formerly 1b7dd13525]]
Former-commit-id: 1d7a263d7bb684e35dafbb6c76df324cb708edde [formerly 67eb0867ea]
Former-commit-id: 7481634fdb
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
c2e3e72d01 Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 23d6da4a18 [formerly 6bdaba048c [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]]
Former-commit-id: 23d6da4a18
Former-commit-id: ae0185a740 [formerly d2c0499f2c] [formerly e59b9a37c055ead6793b199f1f61c40b65e25ce2 [formerly 3300d8c75c]]
Former-commit-id: b8a7373be1db5d578132241657b4da4ea3baedd5 [formerly c2a3dbe9af]
Former-commit-id: dd315aa9b8
2014-05-01 18:02:08 -05:00
Richard Peter
711be53fea Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 36d579c206 [formerly 1738b065b8] [formerly a9b088146c] [formerly 36d579c206 [formerly 1738b065b8] [formerly a9b088146c] [formerly bcd87195ee [formerly a9b088146c [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]]
Former-commit-id: bcd87195ee
Former-commit-id: 2d597d61ab [formerly 926cd5f6d1] [formerly 3fa1d18ae07b1ff8c4ffc4b83cd39952d11ded1d [formerly e1a2767f8f]]
Former-commit-id: 4fe9ed9b053941aaa7d97f487449c7e8441c5f10 [formerly df422d1516]
Former-commit-id: 338b2c53d0
2014-05-01 16:30:21 -05:00
Nate Jensen
2b6ad3264c Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly f4d20c41f4 [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 9f08442039 [formerly 6f211aa9f8] [formerly fb99f58ad5a7cfb43ae453f0c000e943ba999928 [formerly f3b68178bd]]
Former-commit-id: 930f4906645edbcafbe567a1652cb392d52f18a5 [formerly 3f9a33bf35]
Former-commit-id: 42a27546f9
2014-05-01 16:28:16 -05:00
Nate Jensen
e2a024ea00 Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b

Former-commit-id: 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly a73a310709 [formerly 137818d03a [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]]
Former-commit-id: a73a310709
Former-commit-id: 834dd4895a [formerly b245e49d53] [formerly 61860d514df7120cc0bb0d8c083c115b3944aa73 [formerly 84dbedcff5]]
Former-commit-id: 48dea045c9df8e5f4f88eaca3f0e152ddc64138d [formerly c7ddb6d476]
Former-commit-id: 562a70b8fb
2014-05-01 16:20:35 -05:00
Richard Peter
d2682acaf2 Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 4056f53fa2 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]]
Former-commit-id: a4fb460e17
Former-commit-id: 3297632b5d [formerly f364f02f58] [formerly 38c78f7ac3ebdff8190b01723125c22a2058c85f [formerly c3c7ebb146]]
Former-commit-id: 7a8980241b9c8931fec2ce1f756924532831bd95 [formerly 472077fbd5]
Former-commit-id: b8bdced87a
2014-05-01 14:47:41 -05:00
Steve Harris
059faff023 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a268173ac [formerly 9a6ab8c52f] [formerly bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be]]
Former-commit-id: 787bb8f6beeae504adb25f278d73dbfbb74159fb [formerly d7c31fe4a9]
Former-commit-id: 523cf536e2
2014-05-01 13:25:15 -05:00
Nate Jensen
b2b5727db3 Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]]
Former-commit-id: 96071c250d
Former-commit-id: c617423fd7 [formerly dbca36c2bc] [formerly 88095fd377297b348e1d0c64c9215b50da8eef27 [formerly 4c2923246a]]
Former-commit-id: f4c5590d3e741902d497b7b5cb7b21c8ccf1049b [formerly 704eff96aa]
Former-commit-id: 7c748842f0
2014-05-01 12:40:41 -05:00
Brian Clements
de694643a9 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly 3ca4f8cc52 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]]
Former-commit-id: dd5412e119
Former-commit-id: 8fc0feed89 [formerly 3fd504f1de] [formerly f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56]]
Former-commit-id: e46f09623a9e504ef25b49b889bf64a2c46ca4bb [formerly c7cea4b5f7]
Former-commit-id: 36b2419ff1
2014-05-01 12:34:09 -05:00
Bryan Kowal
3ec47319cc Issue #3099 - handle empty location name lists in the data request
Former-commit-id: dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 5eac78f0e0 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 5267bae3dd [formerly 4775dc1f40] [formerly 766f5d140cfb513aced9899ffa7b673d5595123d [formerly 2079aec2bb]]
Former-commit-id: e262c8f5f445fb2cdc7edc1447e80f9bd8e97f6e [formerly bf24af6980]
Former-commit-id: 10a57d5299
2014-05-01 12:12:42 -05:00
Nate Jensen
425fdb1674 Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: b911f3e9b5 [formerly 1d157a16e3] [formerly 7fbdb9ff83] [formerly b911f3e9b5 [formerly 1d157a16e3] [formerly 7fbdb9ff83] [formerly bcb82bedc6 [formerly 7fbdb9ff83 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]]]
Former-commit-id: bcb82bedc6
Former-commit-id: 8ae67e0d7f [formerly 037fe502d7] [formerly 793328ce1c59c6fb48e922f66fcf2785e57bd487 [formerly e5eb1ab87e]]
Former-commit-id: acc622a694e300635d3d9dee8f541f47970622d0 [formerly 1b78d60b52]
Former-commit-id: 8961b7305e
2014-05-01 12:06:13 -05:00
Nate Jensen
f4102f6eaf Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
Former-commit-id: 97ea9dd708 [formerly 03b412c136] [formerly b28e5291d6] [formerly 97ea9dd708 [formerly 03b412c136] [formerly b28e5291d6] [formerly 244183db25 [formerly b28e5291d6 [formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]]]
Former-commit-id: 244183db25
Former-commit-id: c7610d0a3a [formerly 59623a97d0] [formerly d915e1041f3582440bb6f108021a9ffb531db781 [formerly 02059a512f]]
Former-commit-id: c6458474c0ccf717cf9ee4e52315c02b81f3edd3 [formerly 800ee1a68c]
Former-commit-id: 1f294864f0
2014-05-01 11:21:54 -05:00
Nate Jensen
7f6e325724 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly 76ad31501b [formerly 2a0775e748 [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]]
Former-commit-id: 76ad31501b
Former-commit-id: 3634889dab [formerly ffb294cab4] [formerly cf11210c48f3e873f15155bc8644fb9af1296446 [formerly 191f6c3385]]
Former-commit-id: a264003449737f399c4846d23735afced10fd273 [formerly ee285cfc57]
Former-commit-id: 4669a93a96
2014-05-01 11:01:37 -05:00
Dave Hladky
800641027c Issue #2992 Missed perl script
Former-commit-id: f844c98853 [formerly 9a43ac36e6] [formerly 23433f628d] [formerly f844c98853 [formerly 9a43ac36e6] [formerly 23433f628d] [formerly 904a608495 [formerly 23433f628d [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]]]
Former-commit-id: 904a608495
Former-commit-id: 76c963b690 [formerly bc4067c5d8] [formerly d66d8ebcef31eae8a5b0eefbe03af2d980e7f476 [formerly dbe4f68100]]
Former-commit-id: 11e66bf207067369386858e6d5a550d4aa1e7161 [formerly 741e809c95]
Former-commit-id: a520e57f73
2014-05-01 08:48:38 -05:00
Greg Armendariz
10a36c1f9d Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: fece69eb09 [formerly 2994753636] [formerly 1e48076fb2] [formerly fece69eb09 [formerly 2994753636] [formerly 1e48076fb2] [formerly 58eaf444bd [formerly 1e48076fb2 [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]]
Former-commit-id: 58eaf444bd
Former-commit-id: 72793f2c24 [formerly 9f6eff005b] [formerly ac1328cf7911a36196114732a8d00e8c762670a8 [formerly e1d91769fe]]
Former-commit-id: 3e7b3d58ae5b3be3e7237d313288d9787261f317 [formerly 733b64a851]
Former-commit-id: 4066e1c518
2014-04-30 19:34:43 -05:00
Brian Clements
542b75e5be 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: fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly f45e435f2c [formerly 873efa1c64 [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]]
Former-commit-id: f45e435f2c
Former-commit-id: 00e7061f42 [formerly 20830253ba] [formerly f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782]]
Former-commit-id: 1a699056f312f4be2eb1ef65d741ba8d01a416f7 [formerly c3d2b4be86]
Former-commit-id: 4c1a6b44c8
2014-04-30 17:52:43 -05:00
Richard Peter
68474fb70c Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 86ddd480c1 [formerly de9eb60629 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 9ee5b7c648 [formerly d961ff6edc] [formerly 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6]]
Former-commit-id: f6db2a6fbbc579ddd2e876bdea84339cafc85568 [formerly dd54408a10]
Former-commit-id: cfb980db11
2014-04-30 17:43:50 -05:00
Greg Armendariz
a139e69d89 Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1
Former-commit-id: b26f22f40d [formerly 95612236c5] [formerly 4d76163f10] [formerly b26f22f40d [formerly 95612236c5] [formerly 4d76163f10] [formerly 0354c9ad26 [formerly 4d76163f10 [formerly a93dfbbea0f33fae158cbb1339293334dec0a2c3]]]]
Former-commit-id: 0354c9ad26
Former-commit-id: 14b88d1dfd [formerly c5760afb93] [formerly 5c1c755203c9c48c97d59a8a8fb8e6bca26926d5 [formerly 8b477dfc39]]
Former-commit-id: 0233a452039a8ef2c4579edfca9d5ee345ae0190 [formerly cbd92a321b]
Former-commit-id: e6ffd106a9
2014-04-30 17:42:26 -05:00
Dave Hladky
5fa53b22dc Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly 3b00ae03cc [formerly c352643c79 [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 5fc17cf3b8 [formerly ea791b5ca5] [formerly 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740]]
Former-commit-id: 966b34bc10a6cb76f151b577b0acae7fb953d804 [formerly 5b11e45636]
Former-commit-id: a06db5a4e7
2014-04-30 17:38:28 -05:00
Brian Clements
a4b4e7422b Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: b3825b8032 [formerly e49d150332] [formerly 57f5ac701c] [formerly b3825b8032 [formerly e49d150332] [formerly 57f5ac701c] [formerly 1273846844 [formerly 57f5ac701c [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]]]
Former-commit-id: 1273846844
Former-commit-id: fc004a1db8 [formerly 9fc8796247] [formerly dfe08f3eccdfa7204ab4aa439b2e37da97873ec7 [formerly a074b27951]]
Former-commit-id: ac85044bf4c6fe01113c5248446893c4e42fe06b [formerly d1c9dbcc28]
Former-commit-id: 170d78b62b
2014-04-30 16:41:14 -05:00
Greg Armendariz
12b9229488 Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly 4981b6a438 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: b069ee1ea3 [formerly 94a55e5c31] [formerly 9e10990e64fcefc2ae835d7e6bae34e0905df35d [formerly 784235ab9f]]
Former-commit-id: ba6055d54db48a1a72242f8bdaf2f1b74a5a8483 [formerly 2cd476cc62]
Former-commit-id: e9ba949734
2014-04-30 15:42:42 -05:00
Nate Jensen
c3ff2e1ad4 Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly f005d2f31c [formerly 1eade4f434 [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]]
Former-commit-id: f005d2f31c
Former-commit-id: 299cb28462 [formerly a6df4bd2b2] [formerly 32bb783c21f96ad95b5837b59bfa30c95ba65a23 [formerly b98328113b]]
Former-commit-id: 9716e295e2aaeb50ef7f01c9a4b5eed9b69ac807 [formerly 9b3282fabf]
Former-commit-id: bf92253e0f
2014-04-30 15:16:11 -05:00
Richard Peter
7dbdba81ac Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly f80e16d0c9 [formerly 31d75a4b82413b015353055668defab0095ef893]]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: 307a149bea [formerly f2d07ce35c] [formerly e3670bef923e89a1f5a7985176c384fe933c5958 [formerly 8ddc4eaffd]]
Former-commit-id: e544947f2f7406e11c3bbafca5f51212bcd4decb [formerly 5d18fbe5d3]
Former-commit-id: fe5fe5b587
2014-04-30 14:49:24 -05:00
Ben Steffensmeier
3a60f93af0 Issue #2946 Fix auxillary purge rules.
Former-commit-id: 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 4c06cd6f5e [formerly 2850d80610 [formerly a62bdff82f96e79737269686598687ecef746c01]]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: 410b30ef15 [formerly 076165515a] [formerly a295c948db1f2e4e6f82577553e64171a8f2dc5a [formerly e51a0dcb13]]
Former-commit-id: ab8dc894e2ec9095c6047bed69f4981b7f63857d [formerly 749e7fa56d]
Former-commit-id: c92d5785c9
2014-04-30 14:38:27 -05:00
Nate Jensen
a11f0d304c Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 8cbea21f32 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 65ad418a94 [formerly 9a2c674142] [formerly 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac]]
Former-commit-id: 3b5d2fc28c192ce41c0bfe1d25e5582a85ee8e04 [formerly 58618a1842]
Former-commit-id: eb5dd811ca
2014-04-30 13:08:26 -05:00
Richard Peter
753ede7463 Issue #2854: Reorganize deltaScripts
Former-commit-id: 46a94c88cd [formerly 09f41a6b31] [formerly 56745c942e] [formerly 46a94c88cd [formerly 09f41a6b31] [formerly 56745c942e] [formerly c8e373c098 [formerly 56745c942e [formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]]]
Former-commit-id: c8e373c098
Former-commit-id: d25ceb8da7 [formerly a526600e3e] [formerly d5d0bc708d2a84d887a8b1401a4d596af0a188e3 [formerly e1721cad00]]
Former-commit-id: e5bdfc9c23d1ad9869b9fa62e5f577d39c450737 [formerly 18b4d133c7]
Former-commit-id: 55708f1d55
2014-04-30 13:03:44 -05:00
Mike Duff
458bcee21e Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly c0b2a19a2f [formerly 60bfadd865 [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: e5572a5cd0 [formerly 1e84cb07c2] [formerly b8d16c9b3441a0ac07d22e0891f1c3ff651d8b8d [formerly 0601068b03]]
Former-commit-id: 51a58accf1071311a755ab513c7f0bd32f4500c0 [formerly 927e8ffcbb]
Former-commit-id: ac6147c463
2014-04-30 10:17:56 -05:00
Richard Peter
ae3f94e875 Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 4ae87dcece [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: 3c2ff2733b [formerly f381290ed1] [formerly 87db6e727009d9903d97b834ac5727197c5c6117 [formerly 9663a83d1f]]
Former-commit-id: 113b0b8e619130b9ec6b0fe3a7c274afee04d1dd [formerly 1488bb27f8]
Former-commit-id: 6668196c3d
2014-04-29 16:14:52 -05:00
Ben Steffensmeier
fda1c02fb1 Issue #3081 Use alias in derived paraemters less.
Former-commit-id: fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly 1d38fb2df1 [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: 57f185dd72 [formerly f31d7f826b] [formerly 597f015753893b012533c8d051366fb27a6f6d18 [formerly 539a32666b]]
Former-commit-id: da9381bf6b755d77e05b1e421abebbb397ec6947 [formerly d4d1e28775]
Former-commit-id: b2c93dda87
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
9197afe1d2 Issue #3080 add NaN conversion to Slice.py
Former-commit-id: 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 5959b17732 [formerly 156c25fb9c [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]]
Former-commit-id: 5959b17732
Former-commit-id: 08442c513a [formerly 8a1b16d15e] [formerly b1afe65ee8b094ce8f0e0dd9ca0140878d1a13d8 [formerly ca8cd9fb43]]
Former-commit-id: 3115849b6ade83f809adceb6ed06ab2f79e71325 [formerly 3be0087fb9]
Former-commit-id: af80e94349
2014-04-29 15:35:29 -05:00
Roger Ferrel
be6b9a2db6 Issue #3036 Added check for archive's root directories.
Former-commit-id: fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly 7a2775ecbc [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]]
Former-commit-id: 3259d4d44d
Former-commit-id: a447baa5a0 [formerly 39f7eb1ecc] [formerly c60f0141107a305c80631ce1cee234f0b2f3d1d4 [formerly f71aee1e36]]
Former-commit-id: 5be90d0016ef7703bbda9ec332f33b977a87956f [formerly d9015cddb4]
Former-commit-id: 6751691433
2014-04-29 14:15:11 -05:00
Brian Clements
f23d3ea0b9 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


Former-commit-id: c0aef972af [formerly abb14c67e7] [formerly 5beb3be2e8] [formerly c0aef972af [formerly abb14c67e7] [formerly 5beb3be2e8] [formerly a1e416da97 [formerly 5beb3be2e8 [formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]]]]
Former-commit-id: a1e416da97
Former-commit-id: ad5be1cf6a [formerly 9f1856a6f0] [formerly 1db57f8f23775052064fa72045bb94286cb51a8a [formerly a2c0ba7f0b]]
Former-commit-id: 5477acd025c32c871813f6cc7da0b7a66884ce37 [formerly f03c6cdcf9]
Former-commit-id: 3c8a573a48
2014-04-29 13:48:00 -05:00
Richard Peter
e748b7c1e5 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: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
2014-04-28 16:27:40 -05:00
Lee Venable
b011f13fb1 Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: 761101dd50 [formerly a8ab7f3946] [formerly 573465f316] [formerly 761101dd50 [formerly a8ab7f3946] [formerly 573465f316] [formerly e054a7ab98 [formerly 573465f316 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]]
Former-commit-id: e054a7ab98
Former-commit-id: 090ea0fa5a [formerly eda26e6076] [formerly d8e463c70dce54bf7b40b1d218bccb587c3b88e6 [formerly 43fdbe9ab6]]
Former-commit-id: a4e6f79e43287a75219721e1af377b8859a3b82e [formerly ede8740acc]
Former-commit-id: 3a133f6626
2014-04-28 15:24:26 -05:00
Ben Steffensmeier
9980eb1eb1 Issue #2947 ensure consistent interpolation levels for derived satellite.
Former-commit-id: f4744737e4 [formerly 41b0c1a3c8] [formerly 812eebdd72] [formerly f4744737e4 [formerly 41b0c1a3c8] [formerly 812eebdd72] [formerly f318c9eb62 [formerly 812eebdd72 [formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]]]
Former-commit-id: f318c9eb62
Former-commit-id: e9bc29a18e [formerly bb562c9755] [formerly 78b9fa75af2953ddce6bfad5265e177fb5696833 [formerly 868945fb1b]]
Former-commit-id: d9fda2331fa5824648a44fe1daf5e0b77e37a03d [formerly 40e3df3ba1]
Former-commit-id: c59046cda1
2014-04-28 13:00:39 -05:00
Dave Hladky
31e6954167 Issue #2940 Better error message for bad XMRG config in FFMP
Former-commit-id: a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly 82be445e97 [formerly 2f4c0cd364 [formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]]]]
Former-commit-id: 82be445e97
Former-commit-id: c4212d6252 [formerly 0ea0313cb8] [formerly 5da6cb0fddc03077fb72a39deee5bf043b26cdcb [formerly 3df985a26a]]
Former-commit-id: 16e764fba29e55076fcc6ab1f0cab2f135cb0a91 [formerly a6743a220a]
Former-commit-id: 47d7ed5017
2014-04-28 11:04:35 -05:00
Nate Jensen
5ad4b4430f Merge "Issue #2972 fix thin client startup" into development
Former-commit-id: 99612f1324 [formerly d145961f4c] [formerly 48cab0ae71] [formerly 99612f1324 [formerly d145961f4c] [formerly 48cab0ae71] [formerly dc3ba942a9 [formerly 48cab0ae71 [formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]]
Former-commit-id: dc3ba942a9
Former-commit-id: 8830b4dc71 [formerly 74e77d307a] [formerly e4462ad10f15d550cf3f5675a21220838cb4c684 [formerly 11a3ae5054]]
Former-commit-id: f5b7bcc5cc48a601ee19bd22cfeff91d7968b363 [formerly 195db736e8]
Former-commit-id: d2bfcfa53b
2014-04-25 15:05:07 -05:00
Richard Peter
67a38126d0 Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: dd3a378a6a [formerly 5a0083987b] [formerly 98b35d30c0] [formerly dd3a378a6a [formerly 5a0083987b] [formerly 98b35d30c0] [formerly b06172a798 [formerly 98b35d30c0 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]]
Former-commit-id: b06172a798
Former-commit-id: d45dae2155 [formerly c7882721b2] [formerly 5bda710ce91c29365a5685d0cfa858a81e171800 [formerly f5f6ff0008]]
Former-commit-id: 6f48441c6373c0ec087caa69ab0464b5070630aa [formerly bac20bb9dd]
Former-commit-id: 4ac0d62d7c
2014-04-25 14:57:51 -05:00
Nate Jensen
2f39b6eb88 Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 9a46583271 [formerly 4842f08165 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]]
Former-commit-id: 9a46583271
Former-commit-id: a847ecddfa [formerly 1d6014f363] [formerly 40b297f2098fb561c5a1c6c26494e2f2273f285a [formerly acfc3c2b20]]
Former-commit-id: 94e69def4d9c026f69b3aa3df39355f486b5e5fe [formerly ac0b4dc1f2]
Former-commit-id: 8f87fdc431
2014-04-25 14:57:47 -05:00
Richard Peter
cfd219f2bb Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 6918dc0026 [formerly 36742a30f3 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]]
Former-commit-id: 6918dc0026
Former-commit-id: 4e1a30b4d9 [formerly 433d5a77f6] [formerly e1f4de7e6f2ee07e043c48c470ad8d5b1a46686a [formerly 52e821b5bb]]
Former-commit-id: 983a1eeebf0004a7badd7ac01293b0008554a0e2 [formerly 5a49b7e345]
Former-commit-id: 6775b0dce6
2014-04-25 14:53:22 -05:00
Nate Jensen
145651f252 Issue #3000 fix common.dataplugin.bufrmos manifest
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

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

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

Former-commit-id: f007819a3b [formerly 7811040f3e] [formerly d47a09530a] [formerly f007819a3b [formerly 7811040f3e] [formerly d47a09530a] [formerly 86e9502341 [formerly d47a09530a [formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]]
Former-commit-id: 86e9502341
Former-commit-id: c7a6389dc5 [formerly c802e6a05c] [formerly e06610b8bc72529769fa8960a6b7198bd30c2095 [formerly 27ed7e5dab]]
Former-commit-id: 8c93b8803ebf8badcca85d808ea826377574c911 [formerly ce3c2c1341]
Former-commit-id: 4b6db92b9f
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
d6eadfc34c Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: 214311cc6e [formerly 9478f8adc9] [formerly 2d96d9d2df] [formerly 214311cc6e [formerly 9478f8adc9] [formerly 2d96d9d2df] [formerly fa3d4bb618 [formerly 2d96d9d2df [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 5b61473bd6 [formerly 080c2a48f3] [formerly 5a00a4836af355759bf8bd0c0ffa79adcb056d6b [formerly 7499987f52]]
Former-commit-id: 57669c24cddfb753d969f18626729fa9ecf6418f [formerly 86174019b5]
Former-commit-id: 1bb8ce2cbe
2014-04-25 14:38:36 -05:00
Brian Clements
52e575f833 Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 1dc13cc151 [formerly 5f746c9c56] [formerly 17ab4f6184] [formerly 1dc13cc151 [formerly 5f746c9c56] [formerly 17ab4f6184] [formerly f1213c1bda [formerly 17ab4f6184 [formerly 57120491452b36bf15227bd4b6d0236221c71124]]]]
Former-commit-id: f1213c1bda
Former-commit-id: 922d56617f [formerly ed2d66a6fa] [formerly d5d66283e23493ee2ad0d94aaa29c13df24989de [formerly fe6af8c315]]
Former-commit-id: d581af1f7d2638e596a708f8133e8ab2cb129ea5 [formerly edaaa9a426]
Former-commit-id: eb318a9a0d
2014-04-25 13:41:17 -05:00
Nate Jensen
3d10c5693c Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
Former-commit-id: df22d06b21 [formerly 64a09dbdc6] [formerly cf6992073f] [formerly df22d06b21 [formerly 64a09dbdc6] [formerly cf6992073f] [formerly 0a245df4f1 [formerly cf6992073f [formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]]]]
Former-commit-id: 0a245df4f1
Former-commit-id: ef52d0db9b [formerly 1e47f6f03a] [formerly d69331f521630baa62047e3b82a9cc06c1b48071 [formerly b67f0a616f]]
Former-commit-id: b5a34768ff4b06283a0daa5c53ceb0c2d5389fe0 [formerly 97d3beb64b]
Former-commit-id: e0f4544f94
2014-04-25 13:26:10 -05:00
Richard Peter
4c24417ff1 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: 1395628200 [formerly 86d1ff9427] [formerly 44701f31f2] [formerly 1395628200 [formerly 86d1ff9427] [formerly 44701f31f2] [formerly 5c0f9b5ba5 [formerly 44701f31f2 [formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]]]]
Former-commit-id: 5c0f9b5ba5
Former-commit-id: 947b9d7423 [formerly baee58476f] [formerly 22e220f4dbde49d7ef5d1ef995a55d8c5ac54cff [formerly 60684de8b4]]
Former-commit-id: f265228af3414b3f057894a3a0918b094b692219 [formerly 231dbfc1b9]
Former-commit-id: 928de60c87
2014-04-25 13:07:59 -05:00