Commit graph

5562 commits

Author SHA1 Message Date
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
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
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
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
Slav Korolev
4dca796283 Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
Former-commit-id: f39c9c151d [formerly 150a132320] [formerly 689930c484] [formerly f458f75ecf [formerly 689930c484 [formerly 879a50a60209abf95752c178a0266cdd42bde012]]]
Former-commit-id: f458f75ecf
Former-commit-id: 72ea0b9194f024a8e7ff25eef75d71cd7b0f041d [formerly e78c6edb8c]
Former-commit-id: 27095ecca8
2014-04-24 15:40:52 -04:00
Brad Gonzales
7c1b5b5893 Issue #3035 Increment java component.spec revision value.
Change-Id: I869e6f6adab74ef97d45a057fe42e48d1134dfbf

Former-commit-id: 6b41668093 [formerly 86036c0afb] [formerly 15985b9eac] [formerly 7a0694adca [formerly 15985b9eac [formerly 245c5214910e1a69d1a6de4b46a36130dbd253b4]]]
Former-commit-id: 7a0694adca
Former-commit-id: 8652fe2bf8054c087b7cef1ac2839772b6556ea6 [formerly 5fa1165519]
Former-commit-id: f9b04639a4
2014-04-24 12:48:40 -05:00
David Gillingham
0cbcdd8519 Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec

Former-commit-id: 0566286204 [formerly 6186e67e5c] [formerly eea20ba3ef] [formerly 16adfb2573 [formerly eea20ba3ef [formerly 0b91ae192358aa162833fb332ba4e551878199f9]]]
Former-commit-id: 16adfb2573
Former-commit-id: 2e2cf73a5ee2285806fb961bd9f68a867233523e [formerly 9f27fa7562]
Former-commit-id: 123bd80fa9
2014-04-24 11:11:06 -05:00
Brian Clements
363632479a Issue #2955 ignore duplicate session invites
Former-commit-id: 9f18c5d54c [formerly e81ee94171] [formerly f888819646] [formerly 4fa9afc9ae [formerly f888819646 [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 8ac39537a1c44d7ebe4df3667107708e5209338d [formerly 75465b69ed]
Former-commit-id: 39c2a1ac37
2014-04-24 09:25:54 -05:00
Lee Venable
0c67eecb00 Issue #3040 - Fixed contact request and group name issues.
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e

Former-commit-id: e17fa9f609 [formerly eed8c6cbba] [formerly df05a79d63] [formerly f13ac7e1b9 [formerly df05a79d63 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 0c6b693c6efe16d8a10f2143e1a25863ed0ea9e1 [formerly 222154d094]
Former-commit-id: 421a4e4677
2014-04-23 18:24:25 -05:00
Nate Jensen
d91475a69f Merge "Issue #2623 remove ecf plugins from being included in cave" into development
Former-commit-id: fcc60ae09c [formerly 6b58bd38c1] [formerly b805ff2dbf] [formerly cb23307e20 [formerly b805ff2dbf [formerly 92034458933316352037188cb243c57f64be09cd]]]
Former-commit-id: cb23307e20
Former-commit-id: a83258aee890eef478df509a2bcd56a18208913a [formerly e90a79cc81]
Former-commit-id: b8c0ae3f41
2014-04-23 17:36:51 -05:00
Richard Peter
e6178a7569 Merge "Issue #2928: Update DD WebContainer to allow loading properties from environment" into development
Former-commit-id: 6514bab6d6 [formerly ad824c25ab] [formerly b99353b37d] [formerly 2b379eaedc [formerly b99353b37d [formerly 560113a526caf0572dfcf6e0c4792a071f49f81c]]]
Former-commit-id: 2b379eaedc
Former-commit-id: 6b2bf9a9de2d53bf7dc9d52af04f1d0179689298 [formerly 7f3172341c]
Former-commit-id: 6d25f536be
2014-04-23 17:31:31 -05:00
Richard Peter
c5c3dd640d Merge "Issue #2971 Fix regex in warning.xml" into development
Former-commit-id: fb61e83fa4 [formerly cf02c14cce] [formerly 008c218efc] [formerly 707003e35e [formerly 008c218efc [formerly 51ca0128e66f22a881354bee88e403bbf8afdb93]]]
Former-commit-id: 707003e35e
Former-commit-id: 9bb64ccae99b1f4c4d02fd2da3166672a624cded [formerly 9c3988031c]
Former-commit-id: 100d19c75e
2014-04-23 17:31:10 -05:00
Nate Jensen
168283b32c Issue #2623 remove ecf plugins from being included in cave
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18

Former-commit-id: 692e3de7d0 [formerly baa6714566] [formerly 07fec6a69c] [formerly ecb6b4d0ce [formerly 07fec6a69c [formerly 98e3e2137ecb9ce14f8dfd295791a79a897867a2]]]
Former-commit-id: ecb6b4d0ce
Former-commit-id: 0d4ccc0072c9a7dbe0c56ac010a6d2d20050a50d [formerly 3671e18036]
Former-commit-id: 9bac89c776
2014-04-23 17:29:00 -05:00
Richard Peter
d4c155e693 Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development
Former-commit-id: 14cbe67add [formerly 99036341f3] [formerly 026575b202] [formerly e10434a727 [formerly 026575b202 [formerly 820dfe6db6a1a7abf3c753aebe3d51ead31cd3cc]]]
Former-commit-id: e10434a727
Former-commit-id: 7e8673ea1eef68b1c7e1e7f7774589fb2de1b258 [formerly b4226666be]
Former-commit-id: 4d2ee42fc9
2014-04-23 17:25:25 -05:00
Ron Anderson
0e13abab7f Issue #2971 Fix regex in warning.xml
Change-Id: I74998354d07596551763a0453973ea4a6ea6f806

Former-commit-id: d15c9cd6e1 [formerly 7c3d99cf91] [formerly 27d5639b58] [formerly b1d43ae61a [formerly 27d5639b58 [formerly 60c4d87b387b3902fb0feacbf48807490b17e90c]]]
Former-commit-id: b1d43ae61a
Former-commit-id: 16e44e3fa55957bafc5dfed20b6d7dc47b4760b3 [formerly 5034bcd8fe]
Former-commit-id: cf611f1186
2014-04-23 17:24:41 -05:00
Ben Steffensmeier
7fc6f021f7 Issue #2947 Fixes for derived products with multiple records per frame.
Former-commit-id: 313cb63228 [formerly c6fc0fd4b1] [formerly c19d52db72] [formerly 01fc21b6f2 [formerly c19d52db72 [formerly f47911308acb9d0a90304233da304bdbd0d002e4]]]
Former-commit-id: 01fc21b6f2
Former-commit-id: 5e26c3c2b09cdc4a748a79253c16203bcde2b78f [formerly 0cde4689fa]
Former-commit-id: e3e78283dd
2014-04-23 17:14:02 -05:00
Ron Anderson
569608769f Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
Fixed Wx parsing for AvnFPS

Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73

Former-commit-id: bf6d35aa0f [formerly 2f68fb8f2c] [formerly 221a06e467] [formerly f3185dd206 [formerly 221a06e467 [formerly e636563052042d2dbfab6a4e476b71004b28c165]]]
Former-commit-id: f3185dd206
Former-commit-id: 373f6b66bdafbfe9284322be7df3257cc614b264 [formerly 3e37419dc6]
Former-commit-id: 00f2f374cd
2014-04-23 17:04:16 -05:00
Richard Peter
c52f110408 Issue #2928: Update DD WebContainer to allow loading properties from environment
Change-Id: I1eb31303dd87f3235c78618a7f31778f8f4d6081

Former-commit-id: c02884249a [formerly cbb5854541] [formerly c74786c35c] [formerly 2f8da547ea [formerly c74786c35c [formerly 119282c58744addb3fd1a5c4a1a165f98d6437a8]]]
Former-commit-id: 2f8da547ea
Former-commit-id: 23892cfa0b1fb683de8b77b984ead09341cc83a5 [formerly a526ae0370]
Former-commit-id: 03ffce2459
2014-04-23 16:01:40 -05:00
Nate Jensen
7c32370f3c Merge "Issue #2648 Update hprof info to match grid changes in 14.3" into development
Former-commit-id: 1b913bd7d3 [formerly ba516ceb03] [formerly abf64eafe8] [formerly e8a9f7bec1 [formerly abf64eafe8 [formerly 83adf5698e27e9d62cfc7565c4a3f4c491f8ae93]]]
Former-commit-id: e8a9f7bec1
Former-commit-id: 63de3dd4c01144f6f46c3e0868df4294c7981db8 [formerly 6abfee3b65]
Former-commit-id: 8c9afc819f
2014-04-23 15:44:09 -05:00
Ben Steffensmeier
49ba8c2a49 Issue #2648 Update hprof info to match grid changes in 14.3
Former-commit-id: 582af8d74f [formerly 2dcc596c83] [formerly a608d3a7e9] [formerly 2c82f5ea7a [formerly a608d3a7e9 [formerly c391a6fbb543e467030f45a494e00bc4246c6a36]]]
Former-commit-id: 2c82f5ea7a
Former-commit-id: 2f37c55d5cc4cd56ed0f5114ace2859273222e14 [formerly 17dfcd8c70]
Former-commit-id: 8f3ad535c6
2014-04-23 15:42:33 -05:00
Nate Jensen
73a3cde77b Merge "Issue #2822 shared display invitations always go to cave" into development
Former-commit-id: 68e3650305 [formerly 827112349a] [formerly ad6e4712d6] [formerly 2b20cf5440 [formerly ad6e4712d6 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 56369e0fe9e69598af2bbd95632d4f6ff4857957 [formerly a0423843b3]
Former-commit-id: 418741ce55
2014-04-23 15:30:44 -05:00
Nate Jensen
e44fd81dba Merge "Issue #3060 safety checks for SWT widgets being disposed" into development
Former-commit-id: 4232c6b1b2 [formerly 547bcafdb6] [formerly c193eac6e8] [formerly 1067e4b09c [formerly c193eac6e8 [formerly 0f33d8dfe65574db7cfbf37f7fc34393707538d3]]]
Former-commit-id: 1067e4b09c
Former-commit-id: 5874c8cb5482f0b1e18efc0d04e83673cd092509 [formerly d1c581aed6]
Former-commit-id: a2df4a7ec5
2014-04-23 14:24:33 -05:00
Nate Jensen
7fdda1fe1a Merge "Issue #3053 - updated list selection dialog to be more configurable and fixed subset action." into development
Former-commit-id: b1e102014e [formerly ca0d273b2c] [formerly 12f14086e2] [formerly c310707a46 [formerly 12f14086e2 [formerly b3e00882b85c8042bbe56b97044809f5b96d544b]]]
Former-commit-id: c310707a46
Former-commit-id: 45e9a13aad8393a9f1cb9fe60fb0d3d8772dc3b5 [formerly 27dc9e88da]
Former-commit-id: f921bdb96d
2014-04-23 14:24:25 -05:00