Nate Jensen
5f08921768
Issue #2060 genericize DataURIFieldConverter
...
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4
Former-commit-id: ff6c77420c
[formerly ff6c77420c
[formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]
Former-commit-id: 87b6df4840
Former-commit-id: a6363fc3d4
2014-05-06 13:10:48 -05:00
Nate Jensen
4db3b99181
Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
...
Former-commit-id: 0e3876de34
[formerly 0e3876de34
[formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]
Former-commit-id: 4f734ae7f9
Former-commit-id: 044d086fc1
2014-05-06 13:09:12 -05:00
Nate Jensen
66cd43313a
Issue #2060 fill in units on GridRecords created from URIs
...
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 71b4227061
[formerly 71b4227061
[formerly 949d132cf3260db5f75ea665f21601ab91440958]]
Former-commit-id: 7cea97ab15
Former-commit-id: 6bdbfb7e1a
2014-05-06 12:26:21 -05:00
Richard Peter
4a140afac6
Issue #2726 : Autoset route startup order.
...
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc
Former-commit-id: b148d11ec9
[formerly b148d11ec9
[formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]
Former-commit-id: 4dc91f494f
Former-commit-id: c6719da76b
2014-05-06 09:46:41 -05:00
Lee Venable
f48d571cb6
Issue #3109 - removed code that sets the Cave cursor.
...
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: a6c2260dd1
[formerly a6c2260dd1
[formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]
Former-commit-id: b0a251f4e3
Former-commit-id: 631a8d3cb1
2014-05-05 16:13:31 -05:00
Nate Jensen
0840a62eb8
Issue #2060 fix sat precip for grid data URI removal
...
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: 0cf0f724f4
[formerly 0cf0f724f4
[formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 97597c3ab1
2014-05-05 13:06:08 -05:00
Dave Hladky
cb94f9fc97
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
...
Conflicts:
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.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 333bf8b36d
[formerly 333bf8b36d
[formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 7611339cd8
2014-05-05 12:15:14 -05:00
Nate Jensen
e8b7cec960
Merge "Issue #2956 more safety checks" into omaha_14.3.1
...
Former-commit-id: e9b3041170
[formerly e9b3041170
[formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]
Former-commit-id: d6518bede1
Former-commit-id: 8ee8937daf
2014-05-05 09:45:11 -05:00
Richard Peter
b9351199b8
Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
...
Former-commit-id: dc0b598fd4
[formerly dc0b598fd4
[formerly 28b33188773001c34946464093319dc2a1117be9]]
Former-commit-id: 132d63ac44
Former-commit-id: 5314b412b4
2014-05-02 10:05:59 -05:00
Richard Peter
28c8c6357a
Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
...
Former-commit-id: 51ba60d62b
[formerly 51ba60d62b
[formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]
Former-commit-id: 24f1c7b385
Former-commit-id: 1f7e076018
2014-05-02 10:05:29 -05:00
Richard Peter
67eb0867ea
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
...
Former-commit-id: 478cedd3a3
[formerly 478cedd3a3
[formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]
Former-commit-id: d4a138c534
Former-commit-id: 1b7dd13525
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
c2a3dbe9af
Issue #3095 Update JGridData for creation of numeric java package.
...
Former-commit-id: 6bdaba048c
[formerly 6bdaba048c
[formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]
Former-commit-id: 23d6da4a18
Former-commit-id: 3300d8c75c
2014-05-01 18:02:08 -05:00
Richard Peter
df422d1516
Issue #2854 : Pack commons.lang for alertviz
...
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: a9b088146c
[formerly a9b088146c
[formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]
Former-commit-id: bcd87195ee
Former-commit-id: e1a2767f8f
2014-05-01 16:30:21 -05:00
Nate Jensen
3f9a33bf35
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: f4d20c41f4
[formerly f4d20c41f4
[formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]
Former-commit-id: 7d142d9d9d
Former-commit-id: f3b68178bd
2014-05-01 16:28:16 -05:00
Nate Jensen
c7ddb6d476
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
...
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 137818d03a
[formerly 137818d03a
[formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]
Former-commit-id: a73a310709
Former-commit-id: 84dbedcff5
2014-05-01 16:20:35 -05:00
Richard Peter
472077fbd5
Issue #2854 : Fix features.
...
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: 4056f53fa2
[formerly 4056f53fa2
[formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]
Former-commit-id: a4fb460e17
Former-commit-id: c3c7ebb146
2014-05-01 14:47:41 -05:00
Steve Harris
d7c31fe4a9
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
...
Former-commit-id: c8ba70a146
[formerly c8ba70a146
[formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]
Former-commit-id: 779e85cc77
Former-commit-id: bdf6d0b6be
2014-05-01 13:25:15 -05:00
Nate Jensen
704eff96aa
Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
...
Former-commit-id: b7536a398b
[formerly b7536a398b
[formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]
Former-commit-id: 96071c250d
Former-commit-id: 4c2923246a
2014-05-01 12:40:41 -05:00
Brian Clements
c7cea4b5f7
Issue #2903 changed commons.lang to match other unpacking foss
...
Former-commit-id: 3ca4f8cc52
[formerly 3ca4f8cc52
[formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]
Former-commit-id: dd5412e119
Former-commit-id: 2337d5ef56
2014-05-01 12:34:09 -05:00
Bryan Kowal
bf24af6980
Issue #3099 - handle empty location name lists in the data request
...
Former-commit-id: 5eac78f0e0
[formerly 5eac78f0e0
[formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 2079aec2bb
2014-05-01 12:12:42 -05:00
Nate Jensen
1b78d60b52
Merge "Issue #2854 : Reorganize deltaScripts" into omaha_14.3.1
...
Former-commit-id: 7fbdb9ff83
[formerly 7fbdb9ff83
[formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]
Former-commit-id: bcb82bedc6
Former-commit-id: e5eb1ab87e
2014-05-01 12:06:13 -05:00
Nate Jensen
800ee1a68c
Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
...
Former-commit-id: b28e5291d6
[formerly b28e5291d6
[formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]
Former-commit-id: 244183db25
Former-commit-id: 02059a512f
2014-05-01 11:21:54 -05:00
Nate Jensen
ee285cfc57
Issue #3101 safe cast numpy shape values to Number
...
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c
Former-commit-id: 2a0775e748
[formerly 2a0775e748
[formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]
Former-commit-id: 76ad31501b
Former-commit-id: 191f6c3385
2014-05-01 11:01:37 -05:00
Dave Hladky
741e809c95
Issue #2992 Missed perl script
...
Former-commit-id: 23433f628d
[formerly 23433f628d
[formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]
Former-commit-id: 904a608495
Former-commit-id: dbe4f68100
2014-05-01 08:48:38 -05:00
Greg Armendariz
733b64a851
Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
...
Former-commit-id: 1e48076fb2
[formerly 1e48076fb2
[formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]
Former-commit-id: 58eaf444bd
Former-commit-id: e1d91769fe
2014-04-30 19:34:43 -05:00
Brian Clements
c3d2b4be86
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: 873efa1c64
[formerly 873efa1c64
[formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]
Former-commit-id: f45e435f2c
Former-commit-id: c187523782
2014-04-30 17:52:43 -05:00
Richard Peter
dd54408a10
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
...
Former-commit-id: de9eb60629
[formerly de9eb60629
[formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]
Former-commit-id: 86ddd480c1
Former-commit-id: 6ecb5018b6
2014-04-30 17:43:50 -05:00
Greg Armendariz
cbd92a321b
Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1
...
Former-commit-id: 4d76163f10
[formerly 4d76163f10
[formerly a93dfbbea0f33fae158cbb1339293334dec0a2c3]]
Former-commit-id: 0354c9ad26
Former-commit-id: 8b477dfc39
2014-04-30 17:42:26 -05:00
Dave Hladky
5b11e45636
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: c352643c79
[formerly c352643c79
[formerly a34955102d1316135c4151210daba0e5807ff6c9]]
Former-commit-id: 3b00ae03cc
Former-commit-id: bf42c8d740
2014-04-30 17:38:28 -05:00
Brian Clements
d1c9dbcc28
Issue #3089 fixed init.d script for collaboration dataserver RPM
...
Former-commit-id: 57f5ac701c
[formerly 57f5ac701c
[formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]
Former-commit-id: 1273846844
Former-commit-id: a074b27951
2014-04-30 16:41:14 -05:00
Greg Armendariz
2cd476cc62
Issue #2571 - Update maps.db snapshot and lake shapefile
...
Former-commit-id: 4981b6a438
[formerly 4981b6a438
[formerly c223bac540568492253cf70a7c7d7521eda3a62d]]
Former-commit-id: 2d38c69ac1
Former-commit-id: 784235ab9f
2014-04-30 15:42:42 -05:00
Nate Jensen
9b3282fabf
Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
...
Former-commit-id: 1eade4f434
[formerly 1eade4f434
[formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]
Former-commit-id: f005d2f31c
Former-commit-id: b98328113b
2014-04-30 15:16:11 -05:00
Richard Peter
5d18fbe5d3
Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
...
Former-commit-id: f80e16d0c9
[formerly f80e16d0c9
[formerly 31d75a4b82413b015353055668defab0095ef893]]
Former-commit-id: bfe46bb5e6
Former-commit-id: 8ddc4eaffd
2014-04-30 14:49:24 -05:00
Ben Steffensmeier
749e7fa56d
Issue #2946 Fix auxillary purge rules.
...
Former-commit-id: 2850d80610
[formerly 2850d80610
[formerly a62bdff82f96e79737269686598687ecef746c01]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: e51a0dcb13
2014-04-30 14:38:27 -05:00
Nate Jensen
58618a1842
Issue #2060 fix FFG processing
...
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: 8cbea21f32
[formerly 8cbea21f32
[formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]
Former-commit-id: 9b19f95d24
Former-commit-id: a33ca4e3ac
2014-04-30 13:08:26 -05:00
Richard Peter
18b4d133c7
Issue #2854 : Reorganize deltaScripts
...
Former-commit-id: 56745c942e
[formerly 56745c942e
[formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]
Former-commit-id: c8e373c098
Former-commit-id: e1721cad00
2014-04-30 13:03:44 -05:00
Brian.Dyke
5d31c9ec9a
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: 278aab6b6f
[formerly 278aab6b6f
[formerly 64c3766ed570885a796f846b889d40413e8250c6]]
Former-commit-id: 63137ed69c
Former-commit-id: 8160209e52
2014-04-30 12:57:09 -04:00
Mike Duff
927e8ffcbb
Issue #2860 - Fix to not create empty substitution tags
...
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff
Former-commit-id: 60bfadd865
[formerly 60bfadd865
[formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]
Former-commit-id: c0b2a19a2f
Former-commit-id: 0601068b03
2014-04-30 10:17:56 -05:00
Richard Peter
1488bb27f8
Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
...
Former-commit-id: 4ae87dcece
[formerly 4ae87dcece
[formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: 9663a83d1f
2014-04-29 16:14:52 -05:00
Ben Steffensmeier
d4d1e28775
Issue #3081 Use alias in derived paraemters less.
...
Former-commit-id: 1d38fb2df1
[formerly 1d38fb2df1
[formerly cdbfab27991a9536e48436c084801eb507322e7c]]
Former-commit-id: 60a7f64a5e
Former-commit-id: 539a32666b
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
3be0087fb9
Issue #3080 add NaN conversion to Slice.py
...
Former-commit-id: 156c25fb9c
[formerly 156c25fb9c
[formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]
Former-commit-id: 5959b17732
Former-commit-id: ca8cd9fb43
2014-04-29 15:35:29 -05:00
Roger Ferrel
d9015cddb4
Issue #3036 Added check for archive's root directories.
...
Former-commit-id: 7a2775ecbc
[formerly 7a2775ecbc
[formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]
Former-commit-id: 3259d4d44d
Former-commit-id: f71aee1e36
2014-04-29 14:15:11 -05:00
Brian Clements
f03c6cdcf9
Issue #2906 added close to BUFR parser
...
close netcdf file to solve NFS clean issue
Former-commit-id: 5beb3be2e8
[formerly 5beb3be2e8
[formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]]
Former-commit-id: a1e416da97
Former-commit-id: a2c0ba7f0b
2014-04-29 13:48:00 -05:00
Brian.Dyke
85bf52ef22
Merge branch 'master_14.2.1' into master_14.2.2
...
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 35b637c3e2
[formerly 35b637c3e2
[formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]
Former-commit-id: bdda2e9a7a
Former-commit-id: 59f34e3108
2014-04-29 12:07:21 -04:00
Richard Peter
24a3fe1466
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: 44b1782461
[formerly 44b1782461
[formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 32957285fc
Former-commit-id: 80d4153878
2014-04-28 16:27:40 -05:00
Lee Venable
ede8740acc
Issue #3053 - added check for selected items.
...
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: 573465f316
[formerly 573465f316
[formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]
Former-commit-id: e054a7ab98
Former-commit-id: 43fdbe9ab6
2014-04-28 15:24:26 -05:00
Ben Steffensmeier
40e3df3ba1
Issue #2947 ensure consistent interpolation levels for derived satellite.
...
Former-commit-id: 812eebdd72
[formerly 812eebdd72
[formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]
Former-commit-id: f318c9eb62
Former-commit-id: 868945fb1b
2014-04-28 13:00:39 -05:00
Dave Hladky
a6743a220a
Issue #2940 Better error message for bad XMRG config in FFMP
...
Former-commit-id: 2f4c0cd364
[formerly 2f4c0cd364
[formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]]
Former-commit-id: 82be445e97
Former-commit-id: 3df985a26a
2014-04-28 11:04:35 -05:00
Nate Jensen
195db736e8
Merge "Issue #2972 fix thin client startup" into development
...
Former-commit-id: 48cab0ae71
[formerly 48cab0ae71
[formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]
Former-commit-id: dc3ba942a9
Former-commit-id: 11a3ae5054
2014-04-25 15:05:07 -05:00
Richard Peter
bac20bb9dd
Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
...
Former-commit-id: 98b35d30c0
[formerly 98b35d30c0
[formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]
Former-commit-id: b06172a798
Former-commit-id: f5f6ff0008
2014-04-25 14:57:51 -05:00