Steve Harris
|
f4ea796cea
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: da530db540 [formerly 091555cf10] [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: 4c56844e29
Former-commit-id: 84a98ec4ca [formerly 214b48dcb8]
Former-commit-id: fdc523a026
|
2014-09-19 10:28:57 -05:00 |
|
Brian.Dyke
|
b42aba7839
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: 5415a4939a [formerly 858b91d677] [formerly 5415a4939a [formerly 858b91d677] [formerly af477df90e [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]
Former-commit-id: af477df90e
Former-commit-id: dde3efc567 [formerly 6c4b121752]
Former-commit-id: 66c4758f2d
|
2014-09-08 14:54:16 -04:00 |
|
Steve Harris
|
ecf26b3ac5
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
7e4ab705cc
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
27372f098c
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 2ddc920a4a [formerly 325887e605] [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: dd9d7133d9
Former-commit-id: c8e9153884 [formerly 1839b614df]
Former-commit-id: cd1b914f50
|
2014-08-22 14:16:22 -04:00 |
|
Richard Peter
|
e731db9f47
|
Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1
Former-commit-id: 5a35e873ac [formerly 7331754776] [formerly 5a35e873ac [formerly 7331754776] [formerly fffa5f5294 [formerly 61a982c8624ab6e433692255109119ab9f74655c]]]
Former-commit-id: fffa5f5294
Former-commit-id: 9bb17c886d [formerly ea3ae775c4]
Former-commit-id: ff2891df3b
|
2014-08-21 18:10:00 -05:00 |
|
Bryan Kowal
|
5463bca0f3
|
Omaha #3528 - removed unused versions of ldm from the baseline
Former-commit-id: 8cca8ef455 [formerly 77fa6fcacb] [formerly 8cca8ef455 [formerly 77fa6fcacb] [formerly 15457162e7 [formerly 6a627c05dfc4960c6ec71c95df308b145ff192c7]]]
Former-commit-id: 15457162e7
Former-commit-id: 0ab65e92bd [formerly 2a6af78773]
Former-commit-id: b7fc6f5c86
|
2014-08-21 10:21:15 -05:00 |
|
Bryan Kowal
|
bcbfb778d3
|
Omaha #3544 - unpack the Linux 64-bit SWT jar file post-install.
Former-commit-id: 6d3611101e [formerly c93a830f59] [formerly 6d3611101e [formerly c93a830f59] [formerly 734e4bcc7b [formerly 75df4503184b6e41eb8075f64552aec30e112d12]]]
Former-commit-id: 734e4bcc7b
Former-commit-id: 1ee075dfd0 [formerly 341c09fb76]
Former-commit-id: 6b25d78b84
|
2014-08-21 09:45:16 -05:00 |
|
Steve Harris
|
e55cb7c48e
|
Issue #2875 - re-compile grib2.so with g2clib changes
This reverts commit b7e05d94f9a8d00d081605a63fbe96f098aa35cd [formerly fab7989b69] [formerly 68d2d83309 [formerly 2c7e22f825] [formerly 68d2d83309 [formerly 2c7e22f825] [formerly fab7989b69 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]]].
Former-commit-id: 7fa6315202 [formerly 5f6a29c515] [formerly 7fa6315202 [formerly 5f6a29c515] [formerly cddc961f2c [formerly 2b1665a1d9a1314bb6b0012161a6409ca2e6ebf8]]]
Former-commit-id: cddc961f2c
Former-commit-id: eeb928761d [formerly 2ce04bce32]
Former-commit-id: 41f4647d48
|
2014-08-19 08:18:11 -05:00 |
|
Ana Rivera
|
15b766c9f5
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 11073fdece [formerly 9ada9356c5] [formerly 11073fdece [formerly 9ada9356c5] [formerly 4c585af933 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]]
Former-commit-id: 4c585af933
Former-commit-id: 706336e633 [formerly b5e6172652]
Former-commit-id: 80a0799f46
|
2014-08-15 11:04:23 -05:00 |
|
Ana Rivera
|
0ff1ac5357
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1daa44291e [formerly a44d5d91db] [formerly 1daa44291e [formerly a44d5d91db] [formerly 9bf2df23be [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]]
Former-commit-id: 9bf2df23be
Former-commit-id: c294608c37 [formerly eefe73ee51]
Former-commit-id: 4b42e52ce3
|
2014-08-15 11:02:36 -05:00 |
|
Bryan Kowal
|
a60ab0de0c
|
Omaha #3475 - PostgreSQL Upgrade.
amend: vacuum databases after upgrade due to: http://www.postgresql.org/docs/9.3/static/release-9-3-2.html E.4.2 VACUUM tests
amend: update viz xdat to use the newer PostgreSQL jdbc driver
amend: fix formatting
Change-Id: Icda3348eea3e5edd879acb3a897bc530e73fb7f3
Former-commit-id: 3d68ae0c78 [formerly f6bc96829e] [formerly 3d68ae0c78 [formerly f6bc96829e] [formerly a2be914331 [formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]]]
Former-commit-id: a2be914331
Former-commit-id: c15190b7f6 [formerly 0894026a79]
Former-commit-id: 0b5fc6aa0e
|
2014-08-12 15:10:39 -05:00 |
|
Brian.Dyke
|
10510022f3
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 63f000f11d [formerly 59183249ed] [formerly 63f000f11d [formerly 59183249ed] [formerly aefe154e51 [formerly 84fc55492f7eccf55d3bf8e7e3227c882286a8fb]]]
Former-commit-id: aefe154e51
Former-commit-id: ba4ddf9ceb [formerly 6043825b4c]
Former-commit-id: 7164c95a12
|
2014-08-12 13:24:35 -04:00 |
|
Steve Harris
|
56a6d18d9a
|
Issue #3507 - Revert "Issue #2875 - re-compile grib2.so with g2clib changes"
This reverts commit 28eacb64209fc40ec9623cf7868be0c8cd4f90eb [formerly e2a0ffe245] [formerly 5b0b491d11 [formerly 428bdf03c8] [formerly 5b0b491d11 [formerly 428bdf03c8] [formerly e2a0ffe245 [formerly 9cab8c4cd5efc7ff30a0c75f3e3cd4459211c157]]]].
Former-commit-id: 68d2d83309 [formerly 2c7e22f825] [formerly 68d2d83309 [formerly 2c7e22f825] [formerly fab7989b69 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]]
Former-commit-id: fab7989b69
Former-commit-id: ce4a52aa14 [formerly e21a119b8f]
Former-commit-id: 346f23a2cf
|
2014-08-12 10:14:57 -05:00 |
|
Bryan Kowal
|
53d6098d90
|
Issue #2875 - re-compile grib2.so with g2clib changes
Former-commit-id: 5b0b491d11 [formerly 428bdf03c8] [formerly 5b0b491d11 [formerly 428bdf03c8] [formerly e2a0ffe245 [formerly 9cab8c4cd5efc7ff30a0c75f3e3cd4459211c157]]]
Former-commit-id: e2a0ffe245
Former-commit-id: 3be068262b [formerly 4eaf5c9b0e]
Former-commit-id: 626c29e113
|
2014-08-12 10:05:08 -05:00 |
|
Richard Peter
|
e59ee6e8c4
|
Issue #3458 Update ldm-6.11.5 queue size
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb
Former-commit-id: 635393cfb5 [formerly a9f8b72b6f] [formerly 635393cfb5 [formerly a9f8b72b6f] [formerly 7317d99519 [formerly c717d54c05cdae71b050eeee6afb06e6c71753a8]]]
Former-commit-id: 7317d99519
Former-commit-id: 17be38c6f8 [formerly 45b822c7cf]
Former-commit-id: f8cfa2ed28
|
2014-08-11 11:54:59 -05:00 |
|
Bryan Kowal
|
0a3fcc0c91
|
Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.
Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903
Former-commit-id: 09442217cd [formerly a9b4b4124a] [formerly 09442217cd [formerly a9b4b4124a] [formerly b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]
Former-commit-id: b568c25e10
Former-commit-id: b0c94a2d61 [formerly 1d6eb95f9f]
Former-commit-id: 25fd6f379f
|
2014-08-07 16:27:46 -05:00 |
|
Richard Peter
|
83c71feeff
|
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: fc6aae3c3c [formerly 477119b739] [formerly fc6aae3c3c [formerly 477119b739] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]
Former-commit-id: 96a1821753
Former-commit-id: bc7d8bfe6d [formerly f7e0a6cf11]
Former-commit-id: fd18b7a134
|
2014-08-07 14:01:54 -05:00 |
|
Bryan Kowal
|
ab26a99200
|
Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: dd7ae1f7d3 [formerly dd00d2fe38] [formerly dd7ae1f7d3 [formerly dd00d2fe38] [formerly 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]
Former-commit-id: 3b080e7c36
Former-commit-id: e1e6244b57 [formerly 8576c55443]
Former-commit-id: 12be1442f1
|
2014-08-06 16:34:35 -05:00 |
|
Richard Peter
|
24f06e6666
|
Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468
Former-commit-id: 01692edc6b [formerly bd2d97dc46] [formerly 01692edc6b [formerly bd2d97dc46] [formerly 8374869379 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]]
Former-commit-id: 8374869379
Former-commit-id: fbb7094b60 [formerly e155de7bbc]
Former-commit-id: 4e7687d442
|
2014-08-06 10:57:31 -05:00 |
|
Greg Armendariz
|
1e7b9aa541
|
Omaha #3327 - update topo rpm to include gmted2010.h5
Former-commit-id: b369662fd9 [formerly f6842be3ed] [formerly b369662fd9 [formerly f6842be3ed] [formerly 7f7c443494 [formerly 8cef78cfc21dd561ebfd5d1af60da915d2a64961]]]
Former-commit-id: 7f7c443494
Former-commit-id: 05fda7902b [formerly 3fc7b439f2]
Former-commit-id: ac45aa9132
|
2014-08-06 09:46:45 -05:00 |
|
Bryan Kowal
|
f736043bf0
|
Omaha #2735 - force the unpack of jface during CAVE installation.
Verified that CAVE still starts successfully.
Former-commit-id: 8ca958407d [formerly a03474e85b] [formerly 8ca958407d [formerly a03474e85b] [formerly 39a4735758 [formerly 084146abc21ba1e8764a8c174209b01d86c98e13]]]
Former-commit-id: 39a4735758
Former-commit-id: 34cab19d10 [formerly 1bef5a39a1]
Former-commit-id: 196251399e
|
2014-07-23 19:19:14 -05:00 |
|
Greg Armendariz
|
80915bec01
|
Omaha #3417 - Update Linux Java to v1.7.0_65
Change-Id: Ib6ea40b5ee4e20f419aae32edcc951470a935311
Former-commit-id: 58e1da9361 [formerly 83e2b2c4c4] [formerly 58e1da9361 [formerly 83e2b2c4c4] [formerly b41ff3e082 [formerly 2a8b1ed12d9e1fe7132105bd7cc6cd8405dcd46d]]]
Former-commit-id: b41ff3e082
Former-commit-id: b22b3ce997 [formerly 4cfa594750]
Former-commit-id: 6706a87b98
|
2014-07-23 14:17:21 -05:00 |
|
Ana Rivera
|
462749040d
|
VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55
Former-commit-id: 9670521c07 [formerly c10b50d0b2] [formerly 9670521c07 [formerly c10b50d0b2] [formerly 088ebd2ca2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]]]
Former-commit-id: 088ebd2ca2
Former-commit-id: 5a764dff66 [formerly 752bc11851]
Former-commit-id: 0eb194e2bb
|
2014-07-21 21:41:17 +00:00 |
|
Bryan Kowal
|
ec5f9c6623
|
Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
Former-commit-id: 58a2ae8bc8 [formerly 98a310f4a7] [formerly 58a2ae8bc8 [formerly 98a310f4a7] [formerly 6a197f845d [formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]]
Former-commit-id: 6a197f845d
Former-commit-id: ac1b94c63f [formerly 0fdfc0fd4a]
Former-commit-id: d1898937e0
|
2014-07-08 09:31:21 -05:00 |
|
Sean.Webb
|
342896c0d7
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 5288764393 [formerly c24c2f1e3e] [formerly 5288764393 [formerly c24c2f1e3e] [formerly 0b29e66772 [formerly add5d004eca457782f957a95262e880b91dfeeb1]]]
Former-commit-id: 0b29e66772
Former-commit-id: cd179cddff [formerly a875ae3f24]
Former-commit-id: c9d3906b32
|
2014-06-30 16:06:25 -04:00 |
|
Roger Ferrel
|
f954d93c5a
|
Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: 32ae3ba73f [formerly bd2d40faee] [formerly 32ae3ba73f [formerly bd2d40faee] [formerly ad6eac6e20 [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]
Former-commit-id: ad6eac6e20
Former-commit-id: 6e37a43757 [formerly 801bdc8fc7]
Former-commit-id: 7fef8ed924
|
2014-06-26 11:16:09 -05:00 |
|
Greg Armendariz
|
4e06a55342
|
Omaha #3299 - Fix qpid dependency
Former-commit-id: 74500b05fc [formerly 9d9ba5a78f] [formerly 74500b05fc [formerly 9d9ba5a78f] [formerly 9d1630a617 [formerly d292734da643f003d9d04e03b32727bf9c007443]]]
Former-commit-id: 9d1630a617
Former-commit-id: 4802ac344e [formerly 58d09cc3ec]
Former-commit-id: 69f085c08c
|
2014-06-19 09:56:10 -05:00 |
|
Greg Armendariz
|
8f76c38e68
|
Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
Former-commit-id: e73a0de182 [formerly faebbc13f7] [formerly e73a0de182 [formerly faebbc13f7] [formerly 8c568a223e [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]]]
Former-commit-id: 8c568a223e
Former-commit-id: 5fd5c7f8ff [formerly 5c8c3ba6b3]
Former-commit-id: a4692c8966
|
2014-06-16 08:57:12 -05:00 |
|
Steve Harris
|
a0d17947a9
|
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: 97843cf58e [formerly 9213369739] [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]
Former-commit-id: e1c8ad2611
Former-commit-id: d7cd0ac02c [formerly 362988b9d7]
Former-commit-id: 8270fd8a9f
|
2014-06-16 08:19:12 -05:00 |
|
Greg Armendariz
|
377d8f3a70
|
Omaha #3247 - Update qpid dependency
Former-commit-id: c14107d4cf [formerly db4e94b713] [formerly c14107d4cf [formerly db4e94b713] [formerly 70104bc9aa [formerly 9a6a0c9941aaa9b49da7329cccb7e05456ad514c]]]
Former-commit-id: 70104bc9aa
Former-commit-id: 3bd1c7ff81 [formerly d2f9344b5f]
Former-commit-id: b8b50069f5
|
2014-06-14 08:13:14 -05:00 |
|
Brian.Dyke
|
40fb1f6159
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e802508e98 [formerly a011c0b6bb] [formerly e802508e98 [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 50073f34b2 [formerly 10696504a0]
Former-commit-id: ac235bf20a
|
2014-06-12 07:07:17 -04:00 |
|
Ana Rivera
|
eb270f539a
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: 4b515bfd0a [formerly 65e90953c2] [formerly 4b515bfd0a [formerly 65e90953c2] [formerly 9da58db461 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]]
Former-commit-id: 9da58db461
Former-commit-id: e249a71765 [formerly 540a286595]
Former-commit-id: 5721d2df05
|
2014-06-11 17:35:55 +00:00 |
|
Brian.Dyke
|
bf96a4ea21
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: de6a06bc8c [formerly d708eeb7d8] [formerly de6a06bc8c [formerly d708eeb7d8] [formerly 7db87d6ccb [formerly f671db68bfab4b9c17eb25050468e5b6306e6359]]]
Former-commit-id: 7db87d6ccb
Former-commit-id: c00bc1d654 [formerly bce3dc1bef]
Former-commit-id: c2d725a60c
|
2014-06-04 11:52:00 -04:00 |
|
Brian.Dyke
|
cdbcdb6cbd
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: feb26ee9b7 [formerly 61b206be0b] [formerly feb26ee9b7 [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 8f6e365ece [formerly 244467210c]
Former-commit-id: 75c6886f61
|
2014-06-04 07:46:16 -04:00 |
|
Kenneth Sperow
|
ca67a59e23
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: a59743ebe0 [formerly c302ef8967] [formerly a59743ebe0 [formerly c302ef8967] [formerly f2a738cc25 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]
Former-commit-id: f2a738cc25
Former-commit-id: 1ba5f0a3c4 [formerly ca913b6159]
Former-commit-id: 3e94502542
|
2014-06-03 20:55:29 -07:00 |
|
Sean.Webb
|
1db1f40b55
|
Merge "ASM #557 - Removed rh6 dependency from wxgtk rpm requirements" into asm_14.3.1
Former-commit-id: 411b64da45 [formerly e46c62660b] [formerly 411b64da45 [formerly e46c62660b] [formerly 94f2a4ab2a [formerly ca4cde97f7304f94bb990dcd53ac39e06c09c7de]]]
Former-commit-id: 94f2a4ab2a
Former-commit-id: 893598ad2f [formerly ae1a95e55b]
Former-commit-id: c3f6e5513b
|
2014-05-30 14:42:34 -05:00 |
|
Sean.Webb
|
fa531fa4b1
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements
Change-Id: I5a59edfb974c945a4d382fad109e513e3a51eeee
Former-commit-id: ba4f3b92ce [formerly af990fb412] [formerly ba4f3b92ce [formerly af990fb412] [formerly 73c2add28e [formerly bba964bd6af7d307a27ee85b11bce03d79f52e97]]]
Former-commit-id: 73c2add28e
Former-commit-id: 84dd29ce87 [formerly 7223f7454e]
Former-commit-id: 7b3b92913d
|
2014-05-30 14:40:44 -04:00 |
|
Sean.Webb
|
d9abb4bf75
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: d899f42637 [formerly c05e8e319e] [formerly d899f42637 [formerly c05e8e319e] [formerly 75f8e82eeb [formerly 88147ed5e5cd84e40acf61ad46d1baa554fd4e28]]]
Former-commit-id: 75f8e82eeb
Former-commit-id: a6a5887fe8 [formerly 43bf2d622f]
Former-commit-id: 6677a8db47
|
2014-05-30 14:27:59 -04:00 |
|
Nate Jensen
|
a49343ddbf
|
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: a709601e2f [formerly 5cfbcb7e98] [formerly a709601e2f [formerly 5cfbcb7e98] [formerly c43a2bf217 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]]
Former-commit-id: c43a2bf217
Former-commit-id: 9804b35063 [formerly c1d092a55d]
Former-commit-id: b4b684876a
|
2014-05-29 13:51:09 -05:00 |
|
Brian Clements
|
fe7c15daa4
|
Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52
Former-commit-id: 4aade4bf2e [formerly 5d0eaf02ab] [formerly 4aade4bf2e [formerly 5d0eaf02ab] [formerly 542d36f107 [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]]
Former-commit-id: 542d36f107
Former-commit-id: 5a52531828 [formerly fcadd3dae9]
Former-commit-id: 7d841b655c
|
2014-05-29 08:19:47 -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 |
|
Greg Armendariz
|
f746096b52
|
Omaha #3215 - Correct script
Former-commit-id: 9c26a31d27 [formerly ac528037a1] [formerly 9c26a31d27 [formerly ac528037a1] [formerly 73765c31ca [formerly 2565b4c918f9215fd65a5dc44778db3a200da8bf]]]
Former-commit-id: 73765c31ca
Former-commit-id: be8b2a480b [formerly c7040bce82]
Former-commit-id: 6a487942e9
|
2014-05-27 15:19:37 -05:00 |
|
Greg Armendariz
|
1a976cb67b
|
Omaha #3215 - Add option for RPM build,
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5
Former-commit-id: 0806135d2e [formerly 265a455ca1] [formerly 0806135d2e [formerly 265a455ca1] [formerly a2e157ed35 [formerly 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b]]]
Former-commit-id: a2e157ed35
Former-commit-id: db01c4b45e [formerly 81ca8ed4c6]
Former-commit-id: bdbdfdaa7a
|
2014-05-27 14:56:33 -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 |
|
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 |
|
Brad Gonzales
|
4599cb6e4a
|
Omaha #3156 Removed geronimo servlet 2.5 jar from dependencies.txt and added it to rpms/awips2.qpid/0.18/SOURCES/awips2/.
Change-Id: I92c8380cdabcb1d4a8ced7fb5ff7d5add0708d82
Former-commit-id: 7d84f97bf8 [formerly 165f9a6e45] [formerly 7d84f97bf8 [formerly 165f9a6e45] [formerly 1dd2a8bf65 [formerly 71e43fad4acee381d7ffb7ca8ba0438283cd99f6]]]
Former-commit-id: 1dd2a8bf65
Former-commit-id: 07aa2f5871 [formerly de22cb1649]
Former-commit-id: a3a02dcc3a
|
2014-05-21 15:22:58 -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 |
|
Brian.Dyke
|
1d53f6d304
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
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
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: f38d0138e6 [formerly 627541512d] [formerly f38d0138e6 [formerly 627541512d] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]
Former-commit-id: d3fa10028c
Former-commit-id: b0837b4905 [formerly 68f3a0169e]
Former-commit-id: f87775928f
|
2014-05-14 16:08:16 -04:00 |
|
Brian.Dyke
|
4cedfadd77
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: 5a2e0c7e1b [formerly e95bc87a19] [formerly 5a2e0c7e1b [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: f9474b087e [formerly 0311366ffb]
Former-commit-id: 3b7a2f1645
|
2014-05-13 11:23:55 -04:00 |
|