Steve Harris
9aa3a5a035
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
...
Former-commit-id: 4e26e224fd
[formerly 65a3390a6a
] [formerly 4e26e224fd
[formerly 65a3390a6a
] [formerly 3bde6b3e41
[formerly ee696cb24c8d72f0562126a131824e958b88f090]]]
Former-commit-id: 3bde6b3e41
Former-commit-id: 0edb16b05e
[formerly c3deafc840
]
Former-commit-id: 46b7122d56
2014-06-02 07:31:14 -05:00
Brian.Dyke
106a921a4c
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: de2df4cb6f
[formerly b8ba378862
] [formerly de2df4cb6f
[formerly b8ba378862
] [formerly c6244e1950
[formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]]
Former-commit-id: c6244e1950
Former-commit-id: 30f72a9337
[formerly 6edbd149a5
]
Former-commit-id: 45deec5df6
2014-06-02 07:01:37 -04:00
Ron Anderson
14f0f927bf
Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
...
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d
Former-commit-id: 916e607254
[formerly 1108744b40
] [formerly 916e607254
[formerly 1108744b40
] [formerly 22d67fcad1
[formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]]
Former-commit-id: 22d67fcad1
Former-commit-id: 808254cd31
[formerly 33abe4a8d3
]
Former-commit-id: ecaa8ab0a9
2014-05-30 10:47:28 -05:00
Brian.Dyke
9351315fd6
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: a0a879be7d
[formerly a8737e18f0
] [formerly a0a879be7d
[formerly a8737e18f0
] [formerly 3f1e12effc
[formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd
[formerly 66aacd6578
]
Former-commit-id: a23d371522
2014-05-30 10:46:25 -04:00
brian.dyke
45dd00f016
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 2c2bb61e95
[formerly 95c5dc49c1
] [formerly 2c2bb61e95
[formerly 95c5dc49c1
] [formerly 03cc2fbbfb
[formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: b6623af1f7
[formerly e09bd1d283
]
Former-commit-id: 3f9ac5ba24
2014-05-30 10:09:00 -04:00
Ron Anderson
9d6658f1e9
Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1
...
Former-commit-id: 27a9790684
[formerly 8309a5656a
] [formerly 27a9790684
[formerly 8309a5656a
] [formerly 7df866b471
[formerly e13f80b81df762d6658cce9ad534dc499791ba46]]]
Former-commit-id: 7df866b471
Former-commit-id: f1a6e6735c
[formerly ff31990a13
]
Former-commit-id: 30495f52db
2014-05-29 18:50:52 -05:00
Ron Anderson
0c06544416
Omaha #2841 Separate queuing of text formatters and product scripts.
...
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8
Former-commit-id: ce4047869c
[formerly a9f3b486f3
] [formerly ce4047869c
[formerly a9f3b486f3
] [formerly 8e1f4331da
[formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]]
Former-commit-id: 8e1f4331da
Former-commit-id: 4d32cb561d
[formerly f765c74e5e
]
Former-commit-id: 114532dd8d
2014-05-29 16:55:02 -05:00
Richard Peter
aaab5e310f
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
...
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: 3beef299b1
[formerly 558699a370
] [formerly 3beef299b1
[formerly 558699a370
] [formerly e2288769d3
[formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]
Former-commit-id: e2288769d3
Former-commit-id: 121f0e00a4
[formerly 220f7aa97a
]
Former-commit-id: 8ba13f812e
2014-05-29 15:50:59 -05:00
Steve Harris
b09109b66e
Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository
...
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a
Former-commit-id: f857812561
[formerly 79d5592fdf
] [formerly f857812561
[formerly 79d5592fdf
] [formerly 5bc251beaa
[formerly c944b3b98f68b8f65b853fb244002e3382dc38a2]]]
Former-commit-id: 5bc251beaa
Former-commit-id: 4af6e9f137
[formerly c830097b13
]
Former-commit-id: 77e18c2e9a
2014-05-29 13:42:09 -05:00
Roger Ferrel
c882871747
Omaha #3171 Change Archive Retention labels.
...
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: eebc5096b2
[formerly 44a23b4500
] [formerly eebc5096b2
[formerly 44a23b4500
] [formerly 825e2c1b19
[formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]
Former-commit-id: 825e2c1b19
Former-commit-id: 73be1f66e9
[formerly 15545c5239
]
Former-commit-id: 6c78b5e04c
2014-05-29 12:33:15 -05:00
Nate Jensen
d1f08dcaf1
Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1
...
Former-commit-id: 6fc643af39
[formerly 3e174fe39c
] [formerly 6fc643af39
[formerly 3e174fe39c
] [formerly 8cc13d8334
[formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]]
Former-commit-id: 8cc13d8334
Former-commit-id: c7da2eec51
[formerly a921570418
]
Former-commit-id: fda484c9ff
2014-05-28 12:43:12 -05:00
Ron Anderson
c237fd2699
Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1
...
Former-commit-id: 8b580a891d
[formerly da0a173698
] [formerly 8b580a891d
[formerly da0a173698
] [formerly 8b5daad4db
[formerly 3869a36a6cad1674e8ec493d03937c21ddde7f21]]]
Former-commit-id: 8b5daad4db
Former-commit-id: 0198ceb40a
[formerly 191283e96d
]
Former-commit-id: 81c044d476
2014-05-28 11:59:51 -05:00
Nate Jensen
d7cba4a465
Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1
...
Former-commit-id: 719c53a044
[formerly 905fa8f283
] [formerly 719c53a044
[formerly 905fa8f283
] [formerly e7dc89cddd
[formerly 55cf25f0671f17e667f7c785f3580a93267f8790]]]
Former-commit-id: e7dc89cddd
Former-commit-id: 3f434ea6e9
[formerly 05b1401849
]
Former-commit-id: e4df449f49
2014-05-28 10:28:49 -05:00
Ron Anderson
1f4bde25d9
Omaha #3110 Permanent fix for mutable database creation.
...
Former-commit-id: 17da90e8db
[formerly 4633de4ea3
] [formerly 17da90e8db
[formerly 4633de4ea3
] [formerly b7271025f9
[formerly a0001c9ed3d414237069f43a29dd907111c16832]]]
Former-commit-id: b7271025f9
Former-commit-id: 3e5acbf168
[formerly f2733999de
]
Former-commit-id: b6b463682f
2014-05-28 10:09:12 -05:00
Steve Harris
5fda99b1fe
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 718c78d984
[formerly be80bd01f3
] [formerly 718c78d984
[formerly be80bd01f3
] [formerly dc74953978
[formerly 802843fa475654ffab03545a4970f4e5857590cd]]]
Former-commit-id: dc74953978
Former-commit-id: 0e9d0b2ef5
[formerly 713cfeffc7
]
Former-commit-id: 6412cc1427
2014-05-28 09:01:00 -05:00
Steve Harris
1f24080b8e
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: a4825f4b27
[formerly 2c49d14c12
] [formerly a4825f4b27
[formerly 2c49d14c12
] [formerly 048d3748b7
[formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]
Former-commit-id: 048d3748b7
Former-commit-id: 005e5b4ee2
[formerly 4ed44b6e72
]
Former-commit-id: 95462b4f80
2014-05-28 07:41:42 -05:00
Nate Jensen
caf433d525
Omaha #3133 Removed dead hydro code and related dependencies
...
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a
Former-commit-id: a984e7ac9a
[formerly 514c9d3a0c
] [formerly a984e7ac9a
[formerly 514c9d3a0c
] [formerly 67ac5fa242
[formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]]
Former-commit-id: 67ac5fa242
Former-commit-id: a25a8b69eb
[formerly c2f78a6888
]
Former-commit-id: 11899e65e2
2014-05-27 18:23:38 -05:00
Steve Harris
172cca39d9
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 3de24b7b07
[formerly 99bc6f990c
] [formerly 3de24b7b07
[formerly 99bc6f990c
] [formerly 3b16bbafb1
[formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea
[formerly 9b98b41cd4
]
Former-commit-id: 144354c369
2014-05-27 14:48:24 -04:00
Slav Korolev
bcc5a458b3
Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
...
Former-commit-id: adba0cd20a
[formerly e3fe3c9736
] [formerly adba0cd20a
[formerly e3fe3c9736
] [formerly 81033087ea
[formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]]
Former-commit-id: 81033087ea
Former-commit-id: 55b01dce6d
[formerly 4a8e7fc38e
]
Former-commit-id: ced313a7f1
2014-05-27 12:24:50 -04:00
Brian Clements
d75008101f
Omaha #3206 added version to servlet api in cave feature
...
without this, the build prefers the javax.servlet in the target platform
Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80
Former-commit-id: f0e8bf76a9
[formerly 6f76a9a328
] [formerly f0e8bf76a9
[formerly 6f76a9a328
] [formerly 2fd2b5aa16
[formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]]]
Former-commit-id: 2fd2b5aa16
Former-commit-id: 170e3644f2
[formerly af8a6806f0
]
Former-commit-id: e88d9a2e8c
2014-05-23 17:04:49 -05:00
Nate Jensen
25e4982cb3
Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
...
Former-commit-id: 730831d465
[formerly 8f6dcfaa1b
] [formerly 730831d465
[formerly 8f6dcfaa1b
] [formerly b67bf1e492
[formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]]]
Former-commit-id: b67bf1e492
Former-commit-id: 76a2766ed4
[formerly 935086d60e
]
Former-commit-id: dcfd7a07eb
2014-05-22 16:46:50 -05:00
Kenneth Sperow
386365e3cb
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3
] [formerly 476c78a2d7
[formerly 189e3cc1f2
] [formerly 476c78a2d7
[formerly 189e3cc1f2
] [formerly 342398e6a3
[formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]]
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f
Former-commit-id: 6f8b069dbe
[formerly 8490f7ea33
] [formerly 6f8b069dbe
[formerly 8490f7ea33
] [formerly 9fa9425aea
[formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 7302462544
[formerly 846395fd42
]
Former-commit-id: 51b0b4e566
2014-05-22 14:16:49 -07:00
Steve Harris
e30dfd21ee
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: 376482d3b1
[formerly 518822ed83
] [formerly 376482d3b1
[formerly 518822ed83
] [formerly b6af2db9f5
[formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]
Former-commit-id: b6af2db9f5
Former-commit-id: 1dfc15a77e
[formerly 14b1ea307f
]
Former-commit-id: d226dfb021
2014-05-22 14:31:06 -05:00
Brian Clements
67376b444a
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: 0a2ddfbc79
[formerly f9de79465a
] [formerly 0a2ddfbc79
[formerly f9de79465a
] [formerly c875f17719
[formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]]
Former-commit-id: c875f17719
Former-commit-id: 53de96dd53
[formerly fd9f98b2ba
]
Former-commit-id: e7730e2219
2014-05-22 14:09:07 -05:00
Steve Harris
5aca60f422
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
...
Former-commit-id: 0a3b23d055
[formerly 4899c4f56a
] [formerly 0a3b23d055
[formerly 4899c4f56a
] [formerly 2059fc9c0e
[formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 805aae1a70
[formerly 0df4af413b
]
Former-commit-id: e7e48b2abb
2014-05-22 14:05:06 -05:00
Ron Anderson
307f61e609
Issue #3194 Fix GeoTIFF import
...
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: a8ba16fc93
[formerly 52931af5ce
] [formerly a8ba16fc93
[formerly 52931af5ce
] [formerly 2a680b73ea
[formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]]
Former-commit-id: 2a680b73ea
Former-commit-id: 8f0eb1fd10
[formerly b7338080e2
]
Former-commit-id: 0d54a37b6c
2014-05-22 09:53:47 -05:00
Matthew Howard
bcae526dc8
Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1
...
Former-commit-id: 00e44aada9
[formerly 95b9746871
] [formerly 00e44aada9
[formerly 95b9746871
] [formerly e17f8a0082
[formerly 5893d06b990cec295338595b006a45bb762b4b73]]]
Former-commit-id: e17f8a0082
Former-commit-id: 56a231e0b0
[formerly 725fff1b13
]
Former-commit-id: eb700ea256
2014-05-22 07:50:50 -05:00
Zhidong.Hao
1b25474707
ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button
...
Change-Id: I764436168339ce46ab01b27c9078455e6a543176
Former-commit-id: 2773af6884
[formerly bcdb0dba95
] [formerly 2773af6884
[formerly bcdb0dba95
] [formerly 77ac5458d0
[formerly d4be1e866c561717a9a7697b3ff451efdd184fe6]]]
Former-commit-id: 77ac5458d0
Former-commit-id: b529afd928
[formerly a65061a58f
]
Former-commit-id: 17a525443c
2014-05-21 09:15:41 -04:00
Richard Peter
680a584473
Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
...
Former-commit-id: dcaedf5d43
[formerly db4c6c8c22
] [formerly dcaedf5d43
[formerly db4c6c8c22
] [formerly f19fda01ad
[formerly 052144dd9929d852543f4eaf959ca3ccce50c5a2]]]
Former-commit-id: f19fda01ad
Former-commit-id: 9faf57cf68
[formerly 02b136759b
]
Former-commit-id: 79a88d24ef
2014-05-20 17:14:29 -05:00
Brian Clements
ebc9bfa351
Omaha #2536 merged edex.textdb into text plugins
...
Former-commit-id: c55124bcc7
[formerly 5b5295e5ad
] [formerly c55124bcc7
[formerly 5b5295e5ad
] [formerly da7d5888b0
[formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]]
Former-commit-id: da7d5888b0
Former-commit-id: e4bb70cbe9
[formerly 003917f0ed
]
Former-commit-id: 30fb567666
2014-05-20 16:07:20 -05:00
Richard Peter
6bccbaccd1
Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
...
Former-commit-id: ab3a7a2804
[formerly 13ac6e8337
] [formerly ab3a7a2804
[formerly 13ac6e8337
] [formerly 2d4d89b3f0
[formerly 62674d17c73d8fdbbe26916aba7ecac572eca2eb]]]
Former-commit-id: 2d4d89b3f0
Former-commit-id: 3264e7bd93
[formerly 0b8c3e67a1
]
Former-commit-id: 580dd1ed1d
2014-05-20 14:56:44 -05:00
Nate Jensen
9d1afa6876
Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1
...
Former-commit-id: 77c77c6b8f
[formerly 1e408e7017
] [formerly 77c77c6b8f
[formerly 1e408e7017
] [formerly 966cf1f96f
[formerly 62054f8f2552058b0b53b79b077a4d7699cb41e9]]]
Former-commit-id: 966cf1f96f
Former-commit-id: eb086ff461
[formerly 88aa9471e1
]
Former-commit-id: 95ed06119c
2014-05-20 14:51:05 -05:00
Brad Gonzales
26953a7864
Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf.
...
Amend: updated manifest.
Removed static imports.
Refactored String constants to Pattern constants in TafConstants.
Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf.
Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf.
fixed .project. Updated yet more Patterns.
Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc
Former-commit-id: c4890beb96
[formerly 6b0e578fc1
] [formerly c4890beb96
[formerly 6b0e578fc1
] [formerly e560ce4880
[formerly f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2]]]
Former-commit-id: e560ce4880
Former-commit-id: 6825727400
[formerly e2412ecb43
]
Former-commit-id: fea1c9febe
2014-05-20 14:13:18 -05:00
Ben Steffensmeier
58e5704651
Omaha #2913 Remove dead code using JAI
...
Former-commit-id: 59a108822e
[formerly d5d3f5605a
] [formerly 59a108822e
[formerly d5d3f5605a
] [formerly d48333444c
[formerly 767fc083618827ad06beff9f6728ea9dd42528f6]]]
Former-commit-id: d48333444c
Former-commit-id: a56f475076
[formerly 98ad1b079e
]
Former-commit-id: 4b940cb599
2014-05-20 13:36:15 -05:00
Brian.Dyke
b0b377e811
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 822ad181bf
[formerly 2fd18d14d6
] [formerly 822ad181bf
[formerly 2fd18d14d6
] [formerly db68b80bbd
[formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]
Former-commit-id: db68b80bbd
Former-commit-id: 937b9bb9ce
[formerly ebcaebb28d
]
Former-commit-id: f42d40c3a3
2014-05-20 14:35:34 -04:00
Ron Anderson
31da20ef5b
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
...
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: b794dd04e1
[formerly 3b404f4083
] [formerly b794dd04e1
[formerly 3b404f4083
] [formerly 809548b283
[formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]]
Former-commit-id: 809548b283
Former-commit-id: fd6e80dd27
[formerly 029201d4b9
]
Former-commit-id: 3f20fc86df
2014-05-20 11:10:26 -05:00
Brian Clements
f0ce9a6ca8
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 455af3612f
[formerly b774503931
] [formerly 455af3612f
[formerly b774503931
] [formerly 8dce7e9b85
[formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: c4447fc6c4
[formerly 4078bbaa63
]
Former-commit-id: 213aab834f
2014-05-20 11:04:57 -05:00
Nate Jensen
508d1a8224
Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1
...
Former-commit-id: f3f64b1e5a
[formerly 8d7125544b
] [formerly f3f64b1e5a
[formerly 8d7125544b
] [formerly eff69410eb
[formerly 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569]]]
Former-commit-id: eff69410eb
Former-commit-id: cc8ba31981
[formerly 7def9ead8e
]
Former-commit-id: 1b18fd4584
2014-05-19 16:21:37 -05:00
Richard Peter
69fea4c8b3
Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
...
Former-commit-id: 80a5f2fc1b
[formerly 40b7623c87
] [formerly 80a5f2fc1b
[formerly 40b7623c87
] [formerly 87da8bd952
[formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]]
Former-commit-id: 87da8bd952
Former-commit-id: c799f78f5d
[formerly 8baf897297
]
Former-commit-id: 1776389eb7
2014-05-19 16:07:51 -05:00
Brian Clements
008c911f03
Omaha #3180 fixed inviting strangers and multiple users in collaboration
...
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited
Former-commit-id: b5e961d6b4
[formerly 0e18d45bdf
] [formerly b5e961d6b4
[formerly 0e18d45bdf
] [formerly 573ffcb0bf
[formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: 6769aff618
[formerly e4433c5e10
]
Former-commit-id: 3c6a10e154
2014-05-19 15:54:36 -05:00
Ben Steffensmeier
eeebf5ae7b
Omaha #3133 remove topo from alertviz feature.
...
Former-commit-id: c4f9bab999
[formerly 24b879764f
] [formerly c4f9bab999
[formerly 24b879764f
] [formerly 31c323151c
[formerly d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807]]]
Former-commit-id: 31c323151c
Former-commit-id: 87118964b1
[formerly 68aba0cdd5
]
Former-commit-id: 0e0229c560
2014-05-19 14:21:23 -05:00
Nate Jensen
80b9e5ee6b
Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1
...
Former-commit-id: 9996d67317
[formerly 76bfba5945
] [formerly 9996d67317
[formerly 76bfba5945
] [formerly 94d032dbc4
[formerly 353d0ddca384a33fe529c0b920595a99c0f40548]]]
Former-commit-id: 94d032dbc4
Former-commit-id: 6fb3e37a29
[formerly 65ecb7e926
]
Former-commit-id: 423bf2f21f
2014-05-19 13:36:26 -05:00
Brian.Dyke
3d35be33cb
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
...
Former-commit-id: c4b7b8dd74
[formerly dbd3bb54e8
] [formerly c4b7b8dd74
[formerly dbd3bb54e8
] [formerly d5a4669fc4
[formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f2885c9996
[formerly f30bd7d9ae
]
Former-commit-id: 39d8bd9004
2014-05-19 14:07:04 -04:00
Brian.Dyke
b65a3a3214
CM-MERGE:OB13.5.5-8 into 14.1.2
...
Former-commit-id: 2eae2be646
[formerly b29db01a59
] [formerly 2eae2be646
[formerly b29db01a59
] [formerly 06c2478539
[formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]
Former-commit-id: 06c2478539
Former-commit-id: 3558d8f162
[formerly 9baa09f4bc
]
Former-commit-id: c88e8d41b6
2014-05-19 13:26:45 -04:00
Richard Peter
8a71079141
Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1
...
Former-commit-id: 1e9c2b27b6
[formerly 0f9015e824
] [formerly 1e9c2b27b6
[formerly 0f9015e824
] [formerly 0480bfa478
[formerly 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c]]]
Former-commit-id: 0480bfa478
Former-commit-id: f3e7d16402
[formerly 802a043085
]
Former-commit-id: fa926cd515
2014-05-19 12:12:05 -05:00
Nate Jensen
b7f846ac6d
Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1
...
Former-commit-id: b93e410f60
[formerly cb6ef0e9a3
] [formerly b93e410f60
[formerly cb6ef0e9a3
] [formerly d79ef53ad0
[formerly 6f3d40c96cafe8f0f05d539534607067a2a37776]]]
Former-commit-id: d79ef53ad0
Former-commit-id: c5d944c52f
[formerly 8a31eaf6e1
]
Former-commit-id: 0bc127a4e9
2014-05-19 11:46:10 -05:00
Brian Clements
de232ae55c
Omaha #2536 merged uf.edex.textdbsrv into text plugins
...
split into uf.common.dataplugin.text and uf.edex.plugin.text
Former-commit-id: 4d40a98ad7
[formerly a06d332ff4
] [formerly 4d40a98ad7
[formerly a06d332ff4
] [formerly 2f5cffbe15
[formerly 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1]]]
Former-commit-id: 2f5cffbe15
Former-commit-id: 7761b74112
[formerly 8ddae2fc54
]
Former-commit-id: f61d1ac976
2014-05-19 10:53:37 -05:00
Ben Steffensmeier
c85c8b6283
Omaha #3164 Disable thin client request compression when it doesn't work.
...
Former-commit-id: d697592de2
[formerly ccf53a4c99
] [formerly d697592de2
[formerly ccf53a4c99
] [formerly 25f901a102
[formerly ce132a929437f18f531503701bb09e33261ae4c4]]]
Former-commit-id: 25f901a102
Former-commit-id: 9ddc32ee05
[formerly 7f46683fb0
]
Former-commit-id: 92f4c86dac
2014-05-19 10:40:50 -05:00
Gang.Zhang
7cd2402325
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
...
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 6e034005e0
[formerly 94fea6748f
] [formerly 6e034005e0
[formerly 94fea6748f
] [formerly 9c1587b92d
[formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]
Former-commit-id: 9c1587b92d
Former-commit-id: ec6053c3f7
[formerly baa1546e39
]
Former-commit-id: b82d8bf6fb
2014-05-19 15:40:41 +01:00
brian.dyke
b2e3c50ec0
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 9626317825
[formerly 011d121e4b
] [formerly 9626317825
[formerly 011d121e4b
] [formerly 58683ad040
[formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d
[formerly bc4649765a
]
Former-commit-id: b42011fc76
2014-05-19 09:45:37 -04:00