Greg Armendariz
72793f2c24
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 58eaf444bd
[formerly 1e48076fb2
[formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]
Former-commit-id: 58eaf444bd
Former-commit-id: ac1328cf7911a36196114732a8d00e8c762670a8 [formerly e1d91769fe
]
Former-commit-id: 9f6eff005b
2014-04-30 19:34:43 -05:00
Brian Clements
00e7061f42
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 f45e435f2c
[formerly 873efa1c64
[formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782
]
Former-commit-id: 20830253ba
2014-04-30 17:52:43 -05:00
Richard Peter
9ee5b7c648
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 86ddd480c1
[formerly de9eb60629
[formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6
]
Former-commit-id: d961ff6edc
2014-04-30 17:43:50 -05:00
Greg Armendariz
14b88d1dfd
Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1
...
Former-commit-id: b26f22f40d
[formerly 95612236c5
] [formerly 4d76163f10
] [formerly 0354c9ad26
[formerly 4d76163f10
[formerly a93dfbbea0f33fae158cbb1339293334dec0a2c3]]]
Former-commit-id: 0354c9ad26
Former-commit-id: 5c1c755203c9c48c97d59a8a8fb8e6bca26926d5 [formerly 8b477dfc39
]
Former-commit-id: c5760afb93
2014-04-30 17:42:26 -05:00
Dave Hladky
5fc17cf3b8
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45f
[formerly e2a4bb6755
] [formerly c352643c79
] [formerly 3b00ae03cc
[formerly c352643c79
[formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740
]
Former-commit-id: ea791b5ca5
2014-04-30 17:38:28 -05:00
Brian Clements
fc004a1db8
Issue #3089 fixed init.d script for collaboration dataserver RPM
...
Former-commit-id: b3825b8032
[formerly e49d150332
] [formerly 57f5ac701c
] [formerly 1273846844
[formerly 57f5ac701c
[formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]]
Former-commit-id: 1273846844
Former-commit-id: dfe08f3eccdfa7204ab4aa439b2e37da97873ec7 [formerly a074b27951
]
Former-commit-id: 9fc8796247
2014-04-30 16:41:14 -05:00
Greg Armendariz
b069ee1ea3
Issue #2571 - Update maps.db snapshot and lake shapefile
...
Former-commit-id: 239ce27244
[formerly 4c245da2a2
] [formerly 4981b6a438
] [formerly 2d38c69ac1
[formerly 4981b6a438
[formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: 9e10990e64fcefc2ae835d7e6bae34e0905df35d [formerly 784235ab9f
]
Former-commit-id: 94a55e5c31
2014-04-30 15:42:42 -05:00
Nate Jensen
299cb28462
Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
...
Former-commit-id: 580a95ed41
[formerly f6f9169aef
] [formerly 1eade4f434
] [formerly f005d2f31c
[formerly 1eade4f434
[formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]
Former-commit-id: f005d2f31c
Former-commit-id: 32bb783c21f96ad95b5837b59bfa30c95ba65a23 [formerly b98328113b
]
Former-commit-id: a6df4bd2b2
2014-04-30 15:16:11 -05:00
Richard Peter
307a149bea
Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
...
Former-commit-id: 9e9ff43e16
[formerly 37a5292083
] [formerly f80e16d0c9
] [formerly bfe46bb5e6
[formerly f80e16d0c9
[formerly 31d75a4b82413b015353055668defab0095ef893]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: e3670bef923e89a1f5a7985176c384fe933c5958 [formerly 8ddc4eaffd
]
Former-commit-id: f2d07ce35c
2014-04-30 14:49:24 -05:00
Ben Steffensmeier
410b30ef15
Issue #2946 Fix auxillary purge rules.
...
Former-commit-id: 8449ec8f22
[formerly bcc02476c6
] [formerly 2850d80610
] [formerly 4c06cd6f5e
[formerly 2850d80610
[formerly a62bdff82f96e79737269686598687ecef746c01]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: a295c948db1f2e4e6f82577553e64171a8f2dc5a [formerly e51a0dcb13
]
Former-commit-id: 076165515a
2014-04-30 14:38:27 -05:00
Nate Jensen
65ad418a94
Issue #2060 fix FFG processing
...
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: acfcaea04e
[formerly 2d19ee46e5
] [formerly 8cbea21f32
] [formerly 9b19f95d24
[formerly 8cbea21f32
[formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac
]
Former-commit-id: 9a2c674142
2014-04-30 13:08:26 -05:00
Richard Peter
d25ceb8da7
Issue #2854 : Reorganize deltaScripts
...
Former-commit-id: 46a94c88cd
[formerly 09f41a6b31
] [formerly 56745c942e
] [formerly c8e373c098
[formerly 56745c942e
[formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]]
Former-commit-id: c8e373c098
Former-commit-id: d5d0bc708d2a84d887a8b1401a4d596af0a188e3 [formerly e1721cad00
]
Former-commit-id: a526600e3e
2014-04-30 13:03:44 -05:00
Brian.Dyke
624606c9dd
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: 2e687fbfb7
[formerly e56bd61ee6
] [formerly 278aab6b6f
] [formerly 63137ed69c
[formerly 278aab6b6f
[formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52
]
Former-commit-id: fcf13ae9f7
2014-04-30 12:57:09 -04:00
Mike Duff
e5572a5cd0
Issue #2860 - Fix to not create empty substitution tags
...
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff
Former-commit-id: 2b1116f380
[formerly 90895cf316
] [formerly 60bfadd865
] [formerly c0b2a19a2f
[formerly 60bfadd865
[formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: b8d16c9b3441a0ac07d22e0891f1c3ff651d8b8d [formerly 0601068b03
]
Former-commit-id: 1e84cb07c2
2014-04-30 10:17:56 -05:00
Richard Peter
3c2ff2733b
Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
...
Former-commit-id: 15d4373fa5
[formerly 74b2cdfe34
] [formerly 4ae87dcece
] [formerly 9dafb3b9e3
[formerly 4ae87dcece
[formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: 87db6e727009d9903d97b834ac5727197c5c6117 [formerly 9663a83d1f
]
Former-commit-id: f381290ed1
2014-04-29 16:14:52 -05:00
Ben Steffensmeier
57f185dd72
Issue #3081 Use alias in derived paraemters less.
...
Former-commit-id: fe893aa216
[formerly fe5d69c896
] [formerly 1d38fb2df1
] [formerly 60a7f64a5e
[formerly 1d38fb2df1
[formerly cdbfab27991a9536e48436c084801eb507322e7c]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: 597f015753893b012533c8d051366fb27a6f6d18 [formerly 539a32666b
]
Former-commit-id: f31d7f826b
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
08442c513a
Issue #3080 add NaN conversion to Slice.py
...
Former-commit-id: 96ebfc4ae9
[formerly eb9a0398df
] [formerly 156c25fb9c
] [formerly 5959b17732
[formerly 156c25fb9c
[formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]
Former-commit-id: 5959b17732
Former-commit-id: b1afe65ee8b094ce8f0e0dd9ca0140878d1a13d8 [formerly ca8cd9fb43
]
Former-commit-id: 8a1b16d15e
2014-04-29 15:35:29 -05:00
Roger Ferrel
a447baa5a0
Issue #3036 Added check for archive's root directories.
...
Former-commit-id: fa703c0060
[formerly 039e4b5209
] [formerly 7a2775ecbc
] [formerly 3259d4d44d
[formerly 7a2775ecbc
[formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]
Former-commit-id: 3259d4d44d
Former-commit-id: c60f0141107a305c80631ce1cee234f0b2f3d1d4 [formerly f71aee1e36
]
Former-commit-id: 39f7eb1ecc
2014-04-29 14:15:11 -05:00
Brian Clements
ad5be1cf6a
Issue #2906 added close to BUFR parser
...
close netcdf file to solve NFS clean issue
Former-commit-id: c0aef972af
[formerly abb14c67e7
] [formerly 5beb3be2e8
] [formerly a1e416da97
[formerly 5beb3be2e8
[formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]]]
Former-commit-id: a1e416da97
Former-commit-id: 1db57f8f23775052064fa72045bb94286cb51a8a [formerly a2c0ba7f0b
]
Former-commit-id: 9f1856a6f0
2014-04-29 13:48:00 -05:00
Brian.Dyke
fba8753c81
Merge branch 'master_14.2.1' into master_14.2.2
...
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 7364553aea
[formerly c5e29cc46a
] [formerly 35b637c3e2
] [formerly bdda2e9a7a
[formerly 35b637c3e2
[formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108
]
Former-commit-id: f8c3dca497
2014-04-29 12:07:21 -04:00
Richard Peter
0dfa8cc4c6
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 32957285fc
[formerly 44b1782461
[formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878
]
Former-commit-id: 6966b79246
2014-04-28 16:27:40 -05:00
Lee Venable
090ea0fa5a
Issue #3053 - added check for selected items.
...
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: 761101dd50
[formerly a8ab7f3946
] [formerly 573465f316
] [formerly e054a7ab98
[formerly 573465f316
[formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]
Former-commit-id: e054a7ab98
Former-commit-id: d8e463c70dce54bf7b40b1d218bccb587c3b88e6 [formerly 43fdbe9ab6
]
Former-commit-id: eda26e6076
2014-04-28 15:24:26 -05:00
Ben Steffensmeier
e9bc29a18e
Issue #2947 ensure consistent interpolation levels for derived satellite.
...
Former-commit-id: f4744737e4
[formerly 41b0c1a3c8
] [formerly 812eebdd72
] [formerly f318c9eb62
[formerly 812eebdd72
[formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]]
Former-commit-id: f318c9eb62
Former-commit-id: 78b9fa75af2953ddce6bfad5265e177fb5696833 [formerly 868945fb1b
]
Former-commit-id: bb562c9755
2014-04-28 13:00:39 -05:00
Dave Hladky
c4212d6252
Issue #2940 Better error message for bad XMRG config in FFMP
...
Former-commit-id: a0a4085459
[formerly dc3b99cbf4
] [formerly 2f4c0cd364
] [formerly 82be445e97
[formerly 2f4c0cd364
[formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]]]
Former-commit-id: 82be445e97
Former-commit-id: 5da6cb0fddc03077fb72a39deee5bf043b26cdcb [formerly 3df985a26a
]
Former-commit-id: 0ea0313cb8
2014-04-28 11:04:35 -05:00
Nate Jensen
8830b4dc71
Merge "Issue #2972 fix thin client startup" into development
...
Former-commit-id: 99612f1324
[formerly d145961f4c
] [formerly 48cab0ae71
] [formerly dc3ba942a9
[formerly 48cab0ae71
[formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]
Former-commit-id: dc3ba942a9
Former-commit-id: e4462ad10f15d550cf3f5675a21220838cb4c684 [formerly 11a3ae5054
]
Former-commit-id: 74e77d307a
2014-04-25 15:05:07 -05:00
Richard Peter
d45dae2155
Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
...
Former-commit-id: dd3a378a6a
[formerly 5a0083987b
] [formerly 98b35d30c0
] [formerly b06172a798
[formerly 98b35d30c0
[formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]
Former-commit-id: b06172a798
Former-commit-id: 5bda710ce91c29365a5685d0cfa858a81e171800 [formerly f5f6ff0008
]
Former-commit-id: c7882721b2
2014-04-25 14:57:51 -05:00
Nate Jensen
a847ecddfa
Merge "Issue #2629 : Update capture to grab Xorg log files." into development
...
Former-commit-id: 23487630e4
[formerly d425f134ae
] [formerly 4842f08165
] [formerly 9a46583271
[formerly 4842f08165
[formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]
Former-commit-id: 9a46583271
Former-commit-id: 40b297f2098fb561c5a1c6c26494e2f2273f285a [formerly acfc3c2b20
]
Former-commit-id: 1d6014f363
2014-04-25 14:57:47 -05:00
Richard Peter
4e1a30b4d9
Issue #2726 : Make SmartInit shutdown more gracefully
...
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7
Former-commit-id: 06d58b0472
[formerly 1781500740
] [formerly 36742a30f3
] [formerly 6918dc0026
[formerly 36742a30f3
[formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]
Former-commit-id: 6918dc0026
Former-commit-id: e1f4de7e6f2ee07e043c48c470ad8d5b1a46686a [formerly 52e821b5bb
]
Former-commit-id: 433d5a77f6
2014-04-25 14:53:22 -05:00
Nate Jensen
d4f4a1ab8c
Issue #3000 fix common.dataplugin.bufrmos manifest
...
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf
Former-commit-id: bf46b40f6e
[formerly 3719815807
] [formerly deda54488f
] [formerly ca2cc7f11d
[formerly deda54488f
[formerly c91c2477aeff207ff253bce22b4fea57a7172d5c]]]
Former-commit-id: ca2cc7f11d
Former-commit-id: 81071d64de116e6f7c310d72f0fca7fcacb07ab3 [formerly 619af04a23
]
Former-commit-id: 4b24593f10
2014-04-25 14:51:45 -05:00
Richard Peter
76d5fc88e4
Issue #2629 : Update capture to grab Xorg log files.
...
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d
Former-commit-id: fd0662eb07
[formerly 5fb2aef966
] [formerly de249decab
] [formerly 1cc7977b99
[formerly de249decab
[formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]]]
Former-commit-id: 1cc7977b99
Former-commit-id: 8adb3a0a5795e22045a287892d0335d8c624a4fe [formerly 7e3d3f3093
]
Former-commit-id: 3f66895529
2014-04-25 14:42:53 -05:00
Nate Jensen
c7a6389dc5
Issue #2972 fix thin client startup
...
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4
Former-commit-id: f007819a3b
[formerly 7811040f3e
] [formerly d47a09530a
] [formerly 86e9502341
[formerly d47a09530a
[formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]
Former-commit-id: 86e9502341
Former-commit-id: e06610b8bc72529769fa8960a6b7198bd30c2095 [formerly 27ed7e5dab
]
Former-commit-id: c802e6a05c
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
5b61473bd6
Issue #2874 Allow RTOFS nowcast to be identified by process type.
...
Former-commit-id: 214311cc6e
[formerly 9478f8adc9
] [formerly 2d96d9d2df
] [formerly fa3d4bb618
[formerly 2d96d9d2df
[formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 5a00a4836af355759bf8bd0c0ffa79adcb056d6b [formerly 7499987f52
]
Former-commit-id: 080c2a48f3
2014-04-25 14:38:36 -05:00
Brian Clements
922d56617f
Issue #3070 fixed contact request logic when adding to group
...
Former-commit-id: 1dc13cc151
[formerly 5f746c9c56
] [formerly 17ab4f6184
] [formerly f1213c1bda
[formerly 17ab4f6184
[formerly 57120491452b36bf15227bd4b6d0236221c71124]]]
Former-commit-id: f1213c1bda
Former-commit-id: d5d66283e23493ee2ad0d94aaa29c13df24989de [formerly fe6af8c315
]
Former-commit-id: ed2d66a6fa
2014-04-25 13:41:17 -05:00
Nate Jensen
ef52d0db9b
Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
...
Former-commit-id: df22d06b21
[formerly 64a09dbdc6
] [formerly cf6992073f
] [formerly 0a245df4f1
[formerly cf6992073f
[formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]]]
Former-commit-id: 0a245df4f1
Former-commit-id: d69331f521630baa62047e3b82a9cc06c1b48071 [formerly b67f0a616f
]
Former-commit-id: 1e47f6f03a
2014-04-25 13:26:10 -05:00
Richard Peter
947b9d7423
Issue #2995 : Update DB Class Finder to search all plugin jars
...
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8
Former-commit-id: 1395628200
[formerly 86d1ff9427
] [formerly 44701f31f2
] [formerly 5c0f9b5ba5
[formerly 44701f31f2
[formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]]]
Former-commit-id: 5c0f9b5ba5
Former-commit-id: 22e220f4dbde49d7ef5d1ef995a55d8c5ac54cff [formerly 60684de8b4
]
Former-commit-id: baee58476f
2014-04-25 13:07:59 -05:00
David Gillingham
05e5630b3c
Merge "Issue #2897 : Add support for Multi-grid Hurricane Wave Models to D2D and GFE." into development
...
Former-commit-id: de1a1853cc
[formerly 073a31bacf
] [formerly 56c6622207
] [formerly f32cf61f22
[formerly 56c6622207
[formerly e18ad8fe1c14c098e33ef98e3eaeb319bc2d1b1a]]]
Former-commit-id: f32cf61f22
Former-commit-id: 6ce8b978732007497f5d383e245538a0bb7dee8d [formerly 78d5c99d63
]
Former-commit-id: 28a1606df8
2014-04-25 12:24:52 -05:00
Nate Jensen
bcece2286a
Issue #2060 remove FFG post processor dependency on dataURI, other minor
...
cleanups
Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410
Former-commit-id: a9f16fe45f
[formerly d9ad750a99
] [formerly 7da49c00f5
] [formerly 74b3181107
[formerly 7da49c00f5
[formerly b45cdd1a3f4742937b9085ca70d538ae724d6aab]]]
Former-commit-id: 74b3181107
Former-commit-id: a8aa65177362b3434658cd408da84eccb363f5c0 [formerly d0dfb21b6e
]
Former-commit-id: f6f962691f
2014-04-25 12:19:23 -05:00
Brian Clements
89c1082c77
Issue #3079 update to lightning name will continue if it encounters invalid xml
...
Former-commit-id: 9d0b557dec
[formerly afdae7c2e1
] [formerly 3305aee692
] [formerly 98adf15cda
[formerly 3305aee692
[formerly 07e7a0eaa6973a705d5fff1beb8ebcb553c172d0]]]
Former-commit-id: 98adf15cda
Former-commit-id: ed0ac441e8aaedea6c613df0559967e9ce0fdded [formerly 5ca56d292a
]
Former-commit-id: 421461fbd8
2014-04-25 11:04:00 -05:00
David Gillingham
8db5524b3f
Issue #2897 : Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
...
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb
Former-commit-id: 777456404b
[formerly c14497b1b7
] [formerly 2426e463f7
] [formerly 6ca193b8e9
[formerly 2426e463f7
[formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: cc410719114014fd14ea4e485ad8351678818e80 [formerly 2e8b8c6e86
]
Former-commit-id: 48bc49fd4b
2014-04-25 10:56:43 -05:00
Brian.Dyke
14a63a19e1
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: 362d882b40
[formerly f0b8ea5822
] [formerly fb1f5aa593
] [formerly 3524838f9f
[formerly fb1f5aa593
[formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad
]
Former-commit-id: bf3758efa3
2014-04-25 11:06:11 -04:00
Richard Peter
93f4506b56
Merge "Issue #2726 : Add hooks to stop archiving processes during shutdown." into development
...
Former-commit-id: 1c3ef27a2e
[formerly 5b3ffb51b0
] [formerly 0b765efce0
] [formerly 225d95171c
[formerly 0b765efce0
[formerly 98e0a18741b559dff887db980d95965edf5f7cae]]]
Former-commit-id: 225d95171c
Former-commit-id: 5b0d5aaeb3bc30824dd69cc2f33ba21d62369299 [formerly 02d1cf94b0
]
Former-commit-id: 7371d8ccdd
2014-04-24 19:15:56 -05:00
Richard Peter
d8950196fa
Issue #2726 : Add hooks to stop archiving processes during shutdown.
...
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: ee59a298eb
[formerly 5b14b22ee1
] [formerly 37342cba87
] [formerly 9a7e1aa9b0
[formerly 37342cba87
[formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: 0442d2b0ea886a8fa3e51c518e72f6a8bad19366 [formerly caccf6ca52
]
Former-commit-id: 2d1262e41f
2014-04-24 19:11:50 -05:00
Nate Jensen
c716f15e1c
Merge "Issue #2060 remove dependency on grid dataURI column from more of DAT" into development
...
Former-commit-id: 35ae8de300
[formerly 2a86a2652d
] [formerly 9ea03a1b3b
] [formerly 9cea7f88fb
[formerly 9ea03a1b3b
[formerly c73204189b318fd3aed128535166f72c99739dba]]]
Former-commit-id: 9cea7f88fb
Former-commit-id: 0e83070df6eb12a90963dab8b3fffa2d9093bdf7 [formerly c86c100079
]
Former-commit-id: 0cc6a6224d
2014-04-24 18:20:27 -05:00
Lee Venable
ae2a0c44df
Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
...
Former-commit-id: 4583301be4
[formerly 15c9311c97
] [formerly a511f8d4e7
] [formerly e7acb04432
[formerly a511f8d4e7
[formerly 9762326cea40526042cd7f371d864a96abd63842]]]
Former-commit-id: e7acb04432
Former-commit-id: 354ff82939ff9af3bda0b0549c79621918a220c7 [formerly 20d563cd15
]
Former-commit-id: ae333a34dc
2014-04-24 17:53:05 -05:00
Lee Venable
cd5d582898
Merge "Issue #3045 Change column label to "Data Set"." into development
...
Former-commit-id: e35e76282f
[formerly fd7a86e187
] [formerly e45c999d47
] [formerly 9642dac1f1
[formerly e45c999d47
[formerly cd77697623d93188b703d2813cbda8af53dbebc7]]]
Former-commit-id: 9642dac1f1
Former-commit-id: 4d167b8c2ca353a3b73426a8094c1a1a3ce6b803 [formerly e776e8c3d0
]
Former-commit-id: 059a2f59b5
2014-04-24 17:42:12 -05:00
Roger Ferrel
f88302b94d
Issue #3045 Change column label to "Data Set".
...
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: dd679c7978
[formerly 8eb4c91ab3
] [formerly 3a2a6afaf1
] [formerly cf6d1c8ca1
[formerly 3a2a6afaf1
[formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: 675b98f9712eaa32b9b8d18b880b9cabd81a288f [formerly 0490023b2c
]
Former-commit-id: 555c8cf617
2014-04-24 16:25:01 -05:00
Brian Clements
32b8ddd64c
Issue #3070 fixed contact request handling
...
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with
Former-commit-id: 345fe6f866
[formerly 334ad3ca81
] [formerly 02f08d75c6
] [formerly 94aa761e19
[formerly 02f08d75c6
[formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]
Former-commit-id: 94aa761e19
Former-commit-id: 71f1e691809a438edfee89c10c322f7e092afc10 [formerly 12304655e8
]
Former-commit-id: 84f75ca30a
2014-04-24 16:10:27 -05:00
Richard Peter
a0f425fe91
Merge "Issue #3068 : Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
...
Former-commit-id: b77f780b13
[formerly c0656c811d
] [formerly b53d914640
] [formerly a21a2bafe1
[formerly b53d914640
[formerly 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d]]]
Former-commit-id: a21a2bafe1
Former-commit-id: ee378d853649aba6df5e619b61b93f4fe55d590e [formerly d08c051727
]
Former-commit-id: 608b342707
2014-04-24 15:43:15 -05:00
Nate Jensen
4b60e9463d
Issue #2060 remove dependency on grid dataURI column from more of DAT
...
Change-Id: I9123d2508f359e65124f90dafdfdf5efeaf1241a
Former-commit-id: ce43456596
[formerly 91df50ded7
] [formerly 6cbd35aa47
] [formerly e1eaca8071
[formerly 6cbd35aa47
[formerly e7963b0bcea141f33a00c264b26ae264d00f3abf]]]
Former-commit-id: e1eaca8071
Former-commit-id: 72cd7c57c4ff74eb9926aa623c3eb1e5f3bd009c [formerly 4f41761508
]
Former-commit-id: 8ecae7aeb5
2014-04-24 15:04:54 -05:00
Roger Ferrel
b511341dc4
Issue #3045 - Change to prevent race conditions while getting table labels.
...
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: dd86b04686
[formerly e2b03eb190
] [formerly 9dad4c959b
] [formerly 2a0a9b5334
[formerly 9dad4c959b
[formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: 54b732727c2263f33c97df4d4d5ff55d84b6f396 [formerly d73f61c7e7
]
Former-commit-id: ef81949dd1
2014-04-24 14:48:15 -05:00