Commit graph

5839 commits

Author SHA1 Message Date
steve.naples
b58b7d3d5a ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: 2f608451c941efcc5372f0d0870ac72409f518e3
2014-05-02 16:15:04 +00:00
Richard Peter
dc0b598fd4 Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 28b33188773001c34946464093319dc2a1117be9
2014-05-02 10:05:59 -05:00
Richard Peter
51ba60d62b Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
Former-commit-id: cab873d5b9437b8abd22adb65c42b886710e50a9
2014-05-02 10:05:29 -05:00
Richard Peter
478cedd3a3 Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: f124cee1070a3dd0e09cb54f773f63095f18bd16
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
6bdaba048c Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: a3081bf46908788e78c707bf51e08f6c98d997bc
2014-05-01 18:02:08 -05:00
Richard Peter
a9b088146c Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 7d69b9fdc60b0c07121eab0119cf45b1624653cd
2014-05-01 16:30:21 -05:00
Nate Jensen
f4d20c41f4 Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: a24190f35b87351a5f699ac05041bec7a13a1cdb
2014-05-01 16:28:16 -05:00
Nate Jensen
137818d03a Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b

Former-commit-id: 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64
2014-05-01 16:20:35 -05:00
David Gillingham
aa78ed1b69 Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf

Former-commit-id: 3d8a23e2e2802d19768de47c61cedb723ec53c8f
2014-05-01 16:19:51 -05:00
Matthew Howard
55b1198186 Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1
Former-commit-id: ef1c0313455700304e9dc8e130f2b8658fdd1ed7
2014-05-01 16:07:11 -05:00
Richard Peter
4056f53fa2 Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b
2014-05-01 14:47:41 -05:00
brian.dyke
5d7b8eca6a Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: c31c7837568ec4a8fd1516a9e9cd115df30cee40
2014-05-01 15:20:36 -04:00
Ben Steffensmeier
d98bdd64d8 Issue #3100 Time match mosaics on data update.
Former-commit-id: 3655558c91224a57a31cfb25389cee33258e0227
2014-05-01 14:17:33 -05:00
Qinglu.Lin
e489658072 ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c

Former-commit-id: 108895dccefb42c71d0f47b13bfd64591e8dca98
2014-05-01 14:49:27 -04:00
Steve Harris
c8ba70a146 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8
2014-05-01 13:25:15 -05:00
Nate Jensen
b7536a398b Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: 1ccbd542f3a5025ba0e0c8d640170972823a583d
2014-05-01 12:40:41 -05:00
Brian Clements
3ca4f8cc52 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: ee24eaf54704dcfdf698089a8269e055f7856c80
2014-05-01 12:34:09 -05:00
Bryan Kowal
5eac78f0e0 Issue #3099 - handle empty location name lists in the data request
Former-commit-id: 79603ec579d6ebcd1ef707f637e1b207ae18f803
2014-05-01 12:12:42 -05:00
Nate Jensen
7fbdb9ff83 Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2
2014-05-01 12:06:13 -05:00
Nate Jensen
b28e5291d6 Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
Former-commit-id: c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa
2014-05-01 11:21:54 -05:00
Nate Jensen
2a0775e748 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb
2014-05-01 11:01:37 -05:00
Gang.Zhang
74dc7a5d7c ASM #507 - Fix incorrect FFMP gap calculation
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 9b33d5187b4535d5500762e15e35e89ccbf5f5da
2014-05-01 15:49:48 +01:00
Dave Hladky
23433f628d Issue #2992 Missed perl script
Former-commit-id: b2c19dd8cfa3eee138f2b9abf7289d464d94ef46
2014-05-01 08:48:38 -05:00
Greg Armendariz
1e48076fb2 Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: b4c0a78c01c9048ccac6fcd098d274380159fd0c
2014-04-30 19:34:43 -05:00
Brian Clements
873efa1c64 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: b27a714c2cbdf2f13eb0c494ace4cbd016ef8132
2014-04-30 17:52:43 -05:00
Richard Peter
de9eb60629 Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 4e6364a24d5f9354946455218cc394fbda4a11ed
2014-04-30 17:43:50 -05:00
Greg Armendariz
4d76163f10 Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1
Former-commit-id: a93dfbbea0f33fae158cbb1339293334dec0a2c3
2014-04-30 17:42:26 -05:00
Dave Hladky
c352643c79 Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: a34955102d1316135c4151210daba0e5807ff6c9
2014-04-30 17:38:28 -05:00
Brian Clements
57f5ac701c Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: 9cdef44104a7453a4b968afd1f3845b1ba69ba06
2014-04-30 16:41:14 -05:00
Greg Armendariz
4981b6a438 Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: c223bac540568492253cf70a7c7d7521eda3a62d
2014-04-30 15:42:42 -05:00
Nate Jensen
1eade4f434 Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: aebaae7802e5429eed3ebc39ae9be45568912d8a
2014-04-30 15:16:11 -05:00
Juliya Dynina
d804167bb2 Merge "ASM #525 - Text Workstation expiration pop-up inconsistent" into asm_14.3.1
Former-commit-id: ceb84b3c7de12a1c64f389a800125443920fbf41
2014-04-30 14:53:36 -05:00
Richard Peter
f80e16d0c9 Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 31d75a4b82413b015353055668defab0095ef893
2014-04-30 14:49:24 -05:00
Ben Steffensmeier
2850d80610 Issue #2946 Fix auxillary purge rules.
Former-commit-id: a62bdff82f96e79737269686598687ecef746c01
2014-04-30 14:38:27 -05:00
brian.dyke
d56fab37e7 Merge branch 'master_14.2.1-22' into asm_14.2.1
Former-commit-id: 3666b29a33ca9c758fa87bd387ebd6ad49b97b2a
2014-04-30 14:21:11 -04:00
Nate Jensen
8cbea21f32 Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 14ce9854abc51b2791b5f93756ae12cbe69b8589
2014-04-30 13:08:26 -05:00
Richard Peter
56745c942e Issue #2854: Reorganize deltaScripts
Former-commit-id: 469c2c597b80fd725f474e0d645656e4054fd69a
2014-04-30 13:03:44 -05:00
Ron Anderson
374e8224f1 Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0

Former-commit-id: 1b0bc4789a7166911762d9947552fe54bfe0a137
2014-04-30 17:26:57 +00:00
Brian.Dyke
278aab6b6f Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 64c3766ed570885a796f846b889d40413e8250c6
2014-04-30 12:57:09 -04:00
Mike Duff
60bfadd865 Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1
2014-04-30 10:17:56 -05:00
Juliya Dynina
d37490acb1 Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
Former-commit-id: a129795302a562e68638bb5e5764f54a8dcc331e
2014-04-30 07:41:27 -05:00
Richard Peter
4ae87dcece Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0
2014-04-29 16:14:52 -05:00
Loubna.Bousaidi
760ee964d6 ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: a6033a982c80e822d9f4cb62a70b9722d79432c6
2014-04-29 21:09:34 +00:00
Steve Harris
d5c1663224 Merge branch 'master_14.2.2' (14.2.2-6) into omaha_14.2.2
Former-commit-id: 260bc939e0bbb957cc7d95c71723f72211cde533
2014-04-29 16:03:25 -05:00
Ben Steffensmeier
1d38fb2df1 Issue #3081 Use alias in derived paraemters less.
Former-commit-id: cdbfab27991a9536e48436c084801eb507322e7c
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
156c25fb9c Issue #3080 add NaN conversion to Slice.py
Former-commit-id: 084a209f64cf9deb527414500c368ea397b9e3a4
2014-04-29 15:35:29 -05:00
Roger Ferrel
7a2775ecbc Issue #3036 Added check for archive's root directories.
Former-commit-id: f344acf3572150c7470ab1e3c3bbb356166c78ff
2014-04-29 14:15:11 -05:00
Brian Clements
5beb3be2e8 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


Former-commit-id: 9675e997369e39455aacadcd72d0d8476f6c7ffc
2014-04-29 13:48:00 -05:00
Brian.Dyke
35b637c3e2 Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: 9a017e543fc6be9fd0d7b9361bd2226bf2af6211
2014-04-29 12:07:21 -04:00
Richard Peter
a80d2981ba Merge "Issue #3084 Fix NXxNY in master_grib2_lookup, update and comment master_grib2_lookup entries." into omaha_14.2.1
Former-commit-id: f3e957f70651f4c50693ba5296b633659671cf63
2014-04-28 16:40:58 -05:00