Steve Harris
|
3c8bfc8160
|
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: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762 [formerly 66b485c000] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457]
Former-commit-id: ecf26b3ac5
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
2da6c7b93b
|
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: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
272905b186
|
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: 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: e348a6abc7 [formerly c8e9153884] [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b [formerly 1839b614df]]
Former-commit-id: 85ccff40908964b07fef1c572de049c609434728 [formerly cd1b914f50]
Former-commit-id: 27372f098c
|
2014-08-22 14:16:22 -04:00 |
|
Richard Peter
|
c381203200
|
Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1
Former-commit-id: b9a08291ec [formerly 5a35e873ac] [formerly 7331754776] [formerly b9a08291ec [formerly 5a35e873ac] [formerly 7331754776] [formerly fffa5f5294 [formerly 7331754776 [formerly 61a982c8624ab6e433692255109119ab9f74655c]]]]
Former-commit-id: fffa5f5294
Former-commit-id: 238d1aa554 [formerly 9bb17c886d] [formerly 78778cd279204109f20aa6114d0cee533bb01487 [formerly ea3ae775c4]]
Former-commit-id: 047dfe5227ab6a00529519249b0efdbf1cea0ff5 [formerly ff2891df3b]
Former-commit-id: e731db9f47
|
2014-08-21 18:10:00 -05:00 |
|
Bryan Kowal
|
77e0a19bc2
|
Omaha #3528 - removed unused versions of ldm from the baseline
Former-commit-id: 23017f003c [formerly 8cca8ef455] [formerly 77fa6fcacb] [formerly 23017f003c [formerly 8cca8ef455] [formerly 77fa6fcacb] [formerly 15457162e7 [formerly 77fa6fcacb [formerly 6a627c05dfc4960c6ec71c95df308b145ff192c7]]]]
Former-commit-id: 15457162e7
Former-commit-id: 4f558834f0 [formerly 0ab65e92bd] [formerly 6a5d64858a2ec95608119611ffe96a489232694c [formerly 2a6af78773]]
Former-commit-id: 4ddb3ad4b56e02ffe96a4a4e7b299a47331a7954 [formerly b7fc6f5c86]
Former-commit-id: 5463bca0f3
|
2014-08-21 10:21:15 -05:00 |
|
Bryan Kowal
|
8db05b7633
|
Omaha #3544 - unpack the Linux 64-bit SWT jar file post-install.
Former-commit-id: 324eb07a85 [formerly 6d3611101e] [formerly c93a830f59] [formerly 324eb07a85 [formerly 6d3611101e] [formerly c93a830f59] [formerly 734e4bcc7b [formerly c93a830f59 [formerly 75df4503184b6e41eb8075f64552aec30e112d12]]]]
Former-commit-id: 734e4bcc7b
Former-commit-id: c6f29b573a [formerly 1ee075dfd0] [formerly ee82061bc968ebbcdf921f4aa4ea0fb22b316950 [formerly 341c09fb76]]
Former-commit-id: 34d44ef0c81f0a64ebcc07193ba6388ed74edbd7 [formerly 6b25d78b84]
Former-commit-id: bcbfb778d3
|
2014-08-21 09:45:16 -05:00 |
|
Steve Harris
|
c428a1c7d7
|
Issue #2875 - re-compile grib2.so with g2clib changes
This reverts commit b7e05d94f9a8d00d081605a63fbe96f098aa35cd [formerly fab7989b69] [formerly 42418f76de [formerly 68d2d83309] [formerly 2c7e22f825] [formerly 42418f76de [formerly 68d2d83309] [formerly 2c7e22f825] [formerly fab7989b69 [formerly 2c7e22f825 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]]]].
Former-commit-id: cd7b8ccb74 [formerly 7fa6315202] [formerly 5f6a29c515] [formerly cd7b8ccb74 [formerly 7fa6315202] [formerly 5f6a29c515] [formerly cddc961f2c [formerly 5f6a29c515 [formerly 2b1665a1d9a1314bb6b0012161a6409ca2e6ebf8]]]]
Former-commit-id: cddc961f2c
Former-commit-id: d06ac748a8 [formerly eeb928761d] [formerly a482ba4bffd956c79173823968070a3f3199b4bb [formerly 2ce04bce32]]
Former-commit-id: 464103bd5da4a2cff39bca8dce7028cda3d70a26 [formerly 41f4647d48]
Former-commit-id: e55cb7c48e
|
2014-08-19 08:18:11 -05:00 |
|
Ana Rivera
|
eff21cac5d
|
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: 2f13aed851 [formerly 11073fdece] [formerly 9ada9356c5] [formerly 2f13aed851 [formerly 11073fdece] [formerly 9ada9356c5] [formerly 4c585af933 [formerly 9ada9356c5 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]]]
Former-commit-id: 4c585af933
Former-commit-id: 1c9c634cbd [formerly 706336e633] [formerly 0a133cea945d17da6363d9f19082865a41af0dc3 [formerly b5e6172652]]
Former-commit-id: 8c09880e14992eb3d51f00d57659cc59ea79b21d [formerly 80a0799f46]
Former-commit-id: 15b766c9f5
|
2014-08-15 11:04:23 -05:00 |
|
Ana Rivera
|
27b8eeca07
|
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: 0a812a313d [formerly 1daa44291e] [formerly a44d5d91db] [formerly 0a812a313d [formerly 1daa44291e] [formerly a44d5d91db] [formerly 9bf2df23be [formerly a44d5d91db [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]]]
Former-commit-id: 9bf2df23be
Former-commit-id: 6c6efd68c0 [formerly c294608c37] [formerly 0dfe16e83678d27d979861133a85a641c588b678 [formerly eefe73ee51]]
Former-commit-id: 35a0a95e45117d91938da4179d30084369566fbe [formerly 4b42e52ce3]
Former-commit-id: 0ff1ac5357
|
2014-08-15 11:02:36 -05:00 |
|
Bryan Kowal
|
f295c59dc4
|
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: b805f1db0d [formerly 3d68ae0c78] [formerly f6bc96829e] [formerly b805f1db0d [formerly 3d68ae0c78] [formerly f6bc96829e] [formerly a2be914331 [formerly f6bc96829e [formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]]]]
Former-commit-id: a2be914331
Former-commit-id: 69a0dce7cb [formerly c15190b7f6] [formerly 7264efe3b00ab6cbe7db1240eea4304e54781900 [formerly 0894026a79]]
Former-commit-id: c201d541cc56ace0f640825213c54136d197f0bf [formerly 0b5fc6aa0e]
Former-commit-id: a60ab0de0c
|
2014-08-12 15:10:39 -05:00 |
|
Brian.Dyke
|
a75337e3e2
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: d023813321 [formerly 63f000f11d] [formerly 59183249ed] [formerly d023813321 [formerly 63f000f11d] [formerly 59183249ed] [formerly aefe154e51 [formerly 59183249ed [formerly 84fc55492f7eccf55d3bf8e7e3227c882286a8fb]]]]
Former-commit-id: aefe154e51
Former-commit-id: 607e1f0c74 [formerly ba4ddf9ceb] [formerly 0894e361fba436b907c0d3bec483ef87116171dc [formerly 6043825b4c]]
Former-commit-id: acf0c24a4fd521cd951401f0ac971ae23801048f [formerly 7164c95a12]
Former-commit-id: 10510022f3
|
2014-08-12 13:24:35 -04:00 |
|
Steve Harris
|
0dad0cd381
|
Issue #3507 - Revert "Issue #2875 - re-compile grib2.so with g2clib changes"
This reverts commit 28eacb64209fc40ec9623cf7868be0c8cd4f90eb [formerly e2a0ffe245] [formerly 7ce040c760 [formerly 5b0b491d11] [formerly 428bdf03c8] [formerly 7ce040c760 [formerly 5b0b491d11] [formerly 428bdf03c8] [formerly e2a0ffe245 [formerly 428bdf03c8 [formerly 9cab8c4cd5efc7ff30a0c75f3e3cd4459211c157]]]]].
Former-commit-id: 42418f76de [formerly 68d2d83309] [formerly 2c7e22f825] [formerly 42418f76de [formerly 68d2d83309] [formerly 2c7e22f825] [formerly fab7989b69 [formerly 2c7e22f825 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]]]
Former-commit-id: fab7989b69
Former-commit-id: c1203390da [formerly ce4a52aa14] [formerly cb4d910e84f610982ea6323078aa8305a1d01b59 [formerly e21a119b8f]]
Former-commit-id: 8256f96b82f8756e8851cc007fe6c50749ef8ebb [formerly 346f23a2cf]
Former-commit-id: 56a6d18d9a
|
2014-08-12 10:14:57 -05:00 |
|
Bryan Kowal
|
9087c62468
|
Issue #2875 - re-compile grib2.so with g2clib changes
Former-commit-id: 7ce040c760 [formerly 5b0b491d11] [formerly 428bdf03c8] [formerly 7ce040c760 [formerly 5b0b491d11] [formerly 428bdf03c8] [formerly e2a0ffe245 [formerly 428bdf03c8 [formerly 9cab8c4cd5efc7ff30a0c75f3e3cd4459211c157]]]]
Former-commit-id: e2a0ffe245
Former-commit-id: 477114dc5d [formerly 3be068262b] [formerly e8923a9a2b8b0731aa4dfa72163036de71804729 [formerly 4eaf5c9b0e]]
Former-commit-id: 1948bea24d5bca87a2d0504922debbb705017a5f [formerly 626c29e113]
Former-commit-id: 53d6098d90
|
2014-08-12 10:05:08 -05:00 |
|
Richard Peter
|
f35fab3963
|
Issue #3458 Update ldm-6.11.5 queue size
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb
Former-commit-id: d63eb7e878 [formerly 635393cfb5] [formerly a9f8b72b6f] [formerly d63eb7e878 [formerly 635393cfb5] [formerly a9f8b72b6f] [formerly 7317d99519 [formerly a9f8b72b6f [formerly c717d54c05cdae71b050eeee6afb06e6c71753a8]]]]
Former-commit-id: 7317d99519
Former-commit-id: e6d51c9740 [formerly 17be38c6f8] [formerly 66e0acf7f0af2dbdffc6fe5b38f0fc4ee6183eb6 [formerly 45b822c7cf]]
Former-commit-id: 822ea61d0178197ef1bd9380f947164d6f40ead4 [formerly f8cfa2ed28]
Former-commit-id: e59ee6e8c4
|
2014-08-11 11:54:59 -05:00 |
|
Bryan Kowal
|
8ba34e138a
|
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: 632e493332 [formerly 09442217cd] [formerly a9b4b4124a] [formerly 632e493332 [formerly 09442217cd] [formerly a9b4b4124a] [formerly b568c25e10 [formerly a9b4b4124a [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]]
Former-commit-id: b568c25e10
Former-commit-id: fbc1786ab1 [formerly b0c94a2d61] [formerly 74192b218460ef7622e9a89c78967d022d36f146 [formerly 1d6eb95f9f]]
Former-commit-id: 76739f9f732ad2b41a7cdf0ad838c5a360a6cc9b [formerly 25fd6f379f]
Former-commit-id: 0a3fcc0c91
|
2014-08-07 16:27:46 -05:00 |
|
Richard Peter
|
9f90398239
|
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: d3ba2f19bf [formerly fc6aae3c3c] [formerly 477119b739] [formerly d3ba2f19bf [formerly fc6aae3c3c] [formerly 477119b739] [formerly 96a1821753 [formerly 477119b739 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]]
Former-commit-id: 96a1821753
Former-commit-id: 6bb571bc37 [formerly bc7d8bfe6d] [formerly 98331407f735241458d85aae0c3f5b6e298efa12 [formerly f7e0a6cf11]]
Former-commit-id: 04049b9d4b9e515e807702c87328284991445618 [formerly fd18b7a134]
Former-commit-id: 83c71feeff
|
2014-08-07 14:01:54 -05:00 |
|
Bryan Kowal
|
5e18599cf4
|
Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: 51cf294761 [formerly dd7ae1f7d3] [formerly dd00d2fe38] [formerly 51cf294761 [formerly dd7ae1f7d3] [formerly dd00d2fe38] [formerly 3b080e7c36 [formerly dd00d2fe38 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]]
Former-commit-id: 3b080e7c36
Former-commit-id: 6a9bfbd79b [formerly e1e6244b57] [formerly 6ec8397ba5668e78293c9747af09f6ddbe896496 [formerly 8576c55443]]
Former-commit-id: 1418e0fe6ccbbc6cfa6a472d836d6367b444f12c [formerly 12be1442f1]
Former-commit-id: ab26a99200
|
2014-08-06 16:34:35 -05:00 |
|
Richard Peter
|
edd8eab06d
|
Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468
Former-commit-id: 1e6502af95 [formerly 01692edc6b] [formerly bd2d97dc46] [formerly 1e6502af95 [formerly 01692edc6b] [formerly bd2d97dc46] [formerly 8374869379 [formerly bd2d97dc46 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]]]
Former-commit-id: 8374869379
Former-commit-id: eb60541db3 [formerly fbb7094b60] [formerly 9a73fc5f58eae211e98112c3ab36c3b2a06bb1de [formerly e155de7bbc]]
Former-commit-id: e05c7dad4a8b16c419ffc3befd4bc04d56250181 [formerly 4e7687d442]
Former-commit-id: 24f06e6666
|
2014-08-06 10:57:31 -05:00 |
|
Greg Armendariz
|
a31a4abfb3
|
Omaha #3327 - update topo rpm to include gmted2010.h5
Former-commit-id: 4cfb1933ea [formerly b369662fd9] [formerly f6842be3ed] [formerly 4cfb1933ea [formerly b369662fd9] [formerly f6842be3ed] [formerly 7f7c443494 [formerly f6842be3ed [formerly 8cef78cfc21dd561ebfd5d1af60da915d2a64961]]]]
Former-commit-id: 7f7c443494
Former-commit-id: e10df89eb8 [formerly 05fda7902b] [formerly 9af1116edfd72d8124912b05dac9254ace507433 [formerly 3fc7b439f2]]
Former-commit-id: 108a14a7f2db6fcd9be96299751a8c442251bdc3 [formerly ac45aa9132]
Former-commit-id: 1e7b9aa541
|
2014-08-06 09:46:45 -05:00 |
|
Bryan Kowal
|
d666e7ab10
|
Omaha #2735 - force the unpack of jface during CAVE installation.
Verified that CAVE still starts successfully.
Former-commit-id: 51f197e6b5 [formerly 8ca958407d] [formerly a03474e85b] [formerly 51f197e6b5 [formerly 8ca958407d] [formerly a03474e85b] [formerly 39a4735758 [formerly a03474e85b [formerly 084146abc21ba1e8764a8c174209b01d86c98e13]]]]
Former-commit-id: 39a4735758
Former-commit-id: 7329283b46 [formerly 34cab19d10] [formerly b5d969165ed16f17acb60ca1e6b21137ee91547a [formerly 1bef5a39a1]]
Former-commit-id: 55cacc130a74dbf48c97457bfb9462e8153020d0 [formerly 196251399e]
Former-commit-id: f736043bf0
|
2014-07-23 19:19:14 -05:00 |
|
Greg Armendariz
|
5a9b7d1604
|
Omaha #3417 - Update Linux Java to v1.7.0_65
Change-Id: Ib6ea40b5ee4e20f419aae32edcc951470a935311
Former-commit-id: d4db32e46f [formerly 58e1da9361] [formerly 83e2b2c4c4] [formerly d4db32e46f [formerly 58e1da9361] [formerly 83e2b2c4c4] [formerly b41ff3e082 [formerly 83e2b2c4c4 [formerly 2a8b1ed12d9e1fe7132105bd7cc6cd8405dcd46d]]]]
Former-commit-id: b41ff3e082
Former-commit-id: f7b9a37f31 [formerly b22b3ce997] [formerly b3385dfe19cc9cce182be746ca5d3043155efa94 [formerly 4cfa594750]]
Former-commit-id: ad433e441b2ec484f59eac296e059fbf57828807 [formerly 6706a87b98]
Former-commit-id: 80915bec01
|
2014-07-23 14:17:21 -05:00 |
|
Bryan Kowal
|
7a007960cf
|
Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
Former-commit-id: ee4b7c4ee8 [formerly 58a2ae8bc8] [formerly 98a310f4a7] [formerly ee4b7c4ee8 [formerly 58a2ae8bc8] [formerly 98a310f4a7] [formerly 6a197f845d [formerly 98a310f4a7 [formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]]]
Former-commit-id: 6a197f845d
Former-commit-id: b2d4debdce [formerly ac1b94c63f] [formerly ed8425afeb482fb12b827adf7402a0eda661e5fb [formerly 0fdfc0fd4a]]
Former-commit-id: d14384ae75f25093f489626ca51658c2d08fe2cc [formerly d1898937e0]
Former-commit-id: ec5f9c6623
|
2014-07-08 09:31:21 -05:00 |
|
Sean.Webb
|
1b7f4a8121
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 4aa35df7c7 [formerly 5288764393] [formerly c24c2f1e3e] [formerly 4aa35df7c7 [formerly 5288764393] [formerly c24c2f1e3e] [formerly 0b29e66772 [formerly c24c2f1e3e [formerly add5d004eca457782f957a95262e880b91dfeeb1]]]]
Former-commit-id: 0b29e66772
Former-commit-id: 010d6b9516 [formerly cd179cddff] [formerly fb4ad3bfb75666fa94af0badd60456d9cfcc4290 [formerly a875ae3f24]]
Former-commit-id: bc0c747f1f72f5b7593a653e0a4748bab19eab8d [formerly c9d3906b32]
Former-commit-id: 342896c0d7
|
2014-06-30 16:06:25 -04:00 |
|
Roger Ferrel
|
f0a6f0841f
|
Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly ad6eac6e20 [formerly bd2d40faee [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]]
Former-commit-id: ad6eac6e20
Former-commit-id: c6e2725ccb [formerly 6e37a43757] [formerly bfed3ce96674059d15316bcc9f04471a2469b25b [formerly 801bdc8fc7]]
Former-commit-id: 2e59e5b070ee1cbe0348eca7fc85285c2835dcc9 [formerly 7fef8ed924]
Former-commit-id: f954d93c5a
|
2014-06-26 11:16:09 -05:00 |
|
Greg Armendariz
|
198ac126fe
|
Omaha #3299 - Fix qpid dependency
Former-commit-id: 261677faf9 [formerly 74500b05fc] [formerly 9d9ba5a78f] [formerly 261677faf9 [formerly 74500b05fc] [formerly 9d9ba5a78f] [formerly 9d1630a617 [formerly 9d9ba5a78f [formerly d292734da643f003d9d04e03b32727bf9c007443]]]]
Former-commit-id: 9d1630a617
Former-commit-id: c8f98b8bbc [formerly 4802ac344e] [formerly 916998cd8ec9d98a002702ddcef3487d8aa30f5c [formerly 58d09cc3ec]]
Former-commit-id: 5972f1e3db76a707ab98d2fc005b2896c303b32a [formerly 69f085c08c]
Former-commit-id: 4e06a55342
|
2014-06-19 09:56:10 -05:00 |
|
Greg Armendariz
|
fd99c75b72
|
Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
Former-commit-id: 670fb899a5 [formerly e73a0de182] [formerly faebbc13f7] [formerly 670fb899a5 [formerly e73a0de182] [formerly faebbc13f7] [formerly 8c568a223e [formerly faebbc13f7 [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]]]]
Former-commit-id: 8c568a223e
Former-commit-id: 474d384f97 [formerly 5fd5c7f8ff] [formerly 06515ca3b86636dd0c3b90da3ce9e562cfb0a30f [formerly 5c8c3ba6b3]]
Former-commit-id: 5412638de8ae0255de5bb2e4a5872af5a408428e [formerly a4692c8966]
Former-commit-id: 8f76c38e68
|
2014-06-16 08:57:12 -05:00 |
|
Steve Harris
|
563cf7b455
|
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: 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly e1c8ad2611 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 6cc0c35e76 [formerly d7cd0ac02c] [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a [formerly 362988b9d7]]
Former-commit-id: 54590884305d436b0bff6e041169417a3fab2fbb [formerly 8270fd8a9f]
Former-commit-id: a0d17947a9
|
2014-06-16 08:19:12 -05:00 |
|
Greg Armendariz
|
f162074444
|
Omaha #3247 - Update qpid dependency
Former-commit-id: 65ced96c6b [formerly c14107d4cf] [formerly db4e94b713] [formerly 65ced96c6b [formerly c14107d4cf] [formerly db4e94b713] [formerly 70104bc9aa [formerly db4e94b713 [formerly 9a6a0c9941aaa9b49da7329cccb7e05456ad514c]]]]
Former-commit-id: 70104bc9aa
Former-commit-id: 00c243d3e5 [formerly 3bd1c7ff81] [formerly 6b75a398d844fb77466653db75848995341ac930 [formerly d2f9344b5f]]
Former-commit-id: 917cb592e0af915082b87572c982ef73760dcf81 [formerly b8b50069f5]
Former-commit-id: 377d8f3a70
|
2014-06-14 08:13:14 -05:00 |
|
Brian.Dyke
|
c7ea1d14a4
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: c4ecd90117 [formerly e802508e98] [formerly a011c0b6bb] [formerly c4ecd90117 [formerly e802508e98] [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly a011c0b6bb [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 319c42800a [formerly 50073f34b2] [formerly 06a7320d681143eaedbb5dc395076f3968649812 [formerly 10696504a0]]
Former-commit-id: 9d9acc84599e418a839ea20c9dba7c2ad790dc86 [formerly ac235bf20a]
Former-commit-id: 40fb1f6159
|
2014-06-12 07:07:17 -04:00 |
|
Ana Rivera
|
c48edea423
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: c1e504cdfa [formerly 4b515bfd0a] [formerly 65e90953c2] [formerly c1e504cdfa [formerly 4b515bfd0a] [formerly 65e90953c2] [formerly 9da58db461 [formerly 65e90953c2 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]]]
Former-commit-id: 9da58db461
Former-commit-id: 0d7b0bd224 [formerly e249a71765] [formerly 127510ed332577a010a023c75dc1fcecd022d0b6 [formerly 540a286595]]
Former-commit-id: 3cc1d10a8464122ec97adf27ec9a0a37f75958f3 [formerly 5721d2df05]
Former-commit-id: eb270f539a
|
2014-06-11 17:35:55 +00:00 |
|
Brian.Dyke
|
a32d416bba
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: 67cef121bf [formerly de6a06bc8c] [formerly d708eeb7d8] [formerly 67cef121bf [formerly de6a06bc8c] [formerly d708eeb7d8] [formerly 7db87d6ccb [formerly d708eeb7d8 [formerly f671db68bfab4b9c17eb25050468e5b6306e6359]]]]
Former-commit-id: 7db87d6ccb
Former-commit-id: 60f06d1e18 [formerly c00bc1d654] [formerly 5941a66242df6eb16b8846d1f66fcfb8133681e4 [formerly bce3dc1bef]]
Former-commit-id: 00394615a5974c6470241fdef97e86ac565c48a6 [formerly c2d725a60c]
Former-commit-id: bf96a4ea21
|
2014-06-04 11:52:00 -04:00 |
|
Brian.Dyke
|
f8fec394e1
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly a91c426ee7 [formerly feb26ee9b7] [formerly 61b206be0b] [formerly 3919c9ec2f [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 7d8dd856bd [formerly 8f6e365ece] [formerly f5c80b02fc2a80a424af9d583f9c067a6dab9c12 [formerly 244467210c]]
Former-commit-id: a57e4cdd13c530f19a214cf1874aa117dbeb8728 [formerly 75c6886f61]
Former-commit-id: cdbcdb6cbd
|
2014-06-04 07:46:16 -04:00 |
|
Kenneth Sperow
|
17b05cb9d9
|
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: 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly 764ffeb440 [formerly a59743ebe0] [formerly c302ef8967] [formerly f2a738cc25 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]]]
Former-commit-id: f2a738cc25
Former-commit-id: be5c7616f5 [formerly 1ba5f0a3c4] [formerly f37bc3930eb01b1551e48a86cb29ce5ebd4ca434 [formerly ca913b6159]]
Former-commit-id: c8835c1e57e17265888c244565b0ad22c4fe3c23 [formerly 3e94502542]
Former-commit-id: ca67a59e23
|
2014-06-03 20:55:29 -07:00 |
|
Sean.Webb
|
d704aeb88e
|
Merge "ASM #557 - Removed rh6 dependency from wxgtk rpm requirements" into asm_14.3.1
Former-commit-id: 7b1183d283 [formerly 411b64da45] [formerly e46c62660b] [formerly 7b1183d283 [formerly 411b64da45] [formerly e46c62660b] [formerly 94f2a4ab2a [formerly e46c62660b [formerly ca4cde97f7304f94bb990dcd53ac39e06c09c7de]]]]
Former-commit-id: 94f2a4ab2a
Former-commit-id: d15ce20f37 [formerly 893598ad2f] [formerly b3245e304fc0c85c3299ae9f4c915b9c21702ea7 [formerly ae1a95e55b]]
Former-commit-id: 2aff84db40b09a7ab9abe2f6744494ded3f4afd1 [formerly c3f6e5513b]
Former-commit-id: 1db1f40b55
|
2014-05-30 14:42:34 -05:00 |
|
Sean.Webb
|
67d44b16cc
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements
Change-Id: I5a59edfb974c945a4d382fad109e513e3a51eeee
Former-commit-id: 0f181e50c0 [formerly ba4f3b92ce] [formerly af990fb412] [formerly 0f181e50c0 [formerly ba4f3b92ce] [formerly af990fb412] [formerly 73c2add28e [formerly af990fb412 [formerly bba964bd6af7d307a27ee85b11bce03d79f52e97]]]]
Former-commit-id: 73c2add28e
Former-commit-id: 909d36fb70 [formerly 84dd29ce87] [formerly 6601c8f842e33b252797671c20cf9d755ff2e332 [formerly 7223f7454e]]
Former-commit-id: d34bc13889533d0f1647d4a25c03acd631f9e9f8 [formerly 7b3b92913d]
Former-commit-id: fa531fa4b1
|
2014-05-30 14:40:44 -04:00 |
|
Sean.Webb
|
eaf0a3cecf
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 8241b1904d [formerly d899f42637] [formerly c05e8e319e] [formerly 8241b1904d [formerly d899f42637] [formerly c05e8e319e] [formerly 75f8e82eeb [formerly c05e8e319e [formerly 88147ed5e5cd84e40acf61ad46d1baa554fd4e28]]]]
Former-commit-id: 75f8e82eeb
Former-commit-id: 3bc3e3a61f [formerly a6a5887fe8] [formerly 69c2ae20cae2240566ece68108ae8a55e64b93db [formerly 43bf2d622f]]
Former-commit-id: c43b5f5ccfa9cddc70bd6d9fbbb3d773442f52ca [formerly 6677a8db47]
Former-commit-id: d9abb4bf75
|
2014-05-30 14:27:59 -04:00 |
|
Nate Jensen
|
4898a1f6e4
|
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: 9fa1b78e76 [formerly a709601e2f] [formerly 5cfbcb7e98] [formerly 9fa1b78e76 [formerly a709601e2f] [formerly 5cfbcb7e98] [formerly c43a2bf217 [formerly 5cfbcb7e98 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]]]
Former-commit-id: c43a2bf217
Former-commit-id: b6ca990c01 [formerly 9804b35063] [formerly 20a4aa18d611a016b3c901eec7c91704211023af [formerly c1d092a55d]]
Former-commit-id: 694a56355e00a39a28d8d855cc619da8cff90f1e [formerly b4b684876a]
Former-commit-id: a49343ddbf
|
2014-05-29 13:51:09 -05:00 |
|
Brian Clements
|
92fabd54e5
|
Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52
Former-commit-id: de85e00fde [formerly 4aade4bf2e] [formerly 5d0eaf02ab] [formerly de85e00fde [formerly 4aade4bf2e] [formerly 5d0eaf02ab] [formerly 542d36f107 [formerly 5d0eaf02ab [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]]]
Former-commit-id: 542d36f107
Former-commit-id: 9afd194e29 [formerly 5a52531828] [formerly e0f60e70ed8514edd19df07556eaaed606a69df4 [formerly fcadd3dae9]]
Former-commit-id: c65d61ba49fd3a54dac5fc9473888a9c3fe5cadc [formerly 7d841b655c]
Former-commit-id: fe7c15daa4
|
2014-05-29 08:19:47 -05:00 |
|
Steve Harris
|
86d6a0cd4d
|
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: 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3 [formerly 0e9d0b2ef5] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427]
Former-commit-id: 5fda99b1fe
|
2014-05-28 09:01:00 -05:00 |
|
Greg Armendariz
|
b8c298cd30
|
Omaha #3215 - Correct script
Former-commit-id: c7f349d5a5 [formerly 9c26a31d27] [formerly ac528037a1] [formerly c7f349d5a5 [formerly 9c26a31d27] [formerly ac528037a1] [formerly 73765c31ca [formerly ac528037a1 [formerly 2565b4c918f9215fd65a5dc44778db3a200da8bf]]]]
Former-commit-id: 73765c31ca
Former-commit-id: 772f68bbe4 [formerly be8b2a480b] [formerly 256e740af4db40ebc9aee9703b37df6292a84fff [formerly c7040bce82]]
Former-commit-id: 51888b856816f07cc52eb276ede7075340f060c7 [formerly 6a487942e9]
Former-commit-id: f746096b52
|
2014-05-27 15:19:37 -05:00 |
|
Greg Armendariz
|
336be12f33
|
Omaha #3215 - Add option for RPM build,
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5
Former-commit-id: 45856116c0 [formerly 0806135d2e] [formerly 265a455ca1] [formerly 45856116c0 [formerly 0806135d2e] [formerly 265a455ca1] [formerly a2e157ed35 [formerly 265a455ca1 [formerly 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b]]]]
Former-commit-id: a2e157ed35
Former-commit-id: 9301eb1844 [formerly db01c4b45e] [formerly 220403a4b2cfd4083d722e770928cca821f9a677 [formerly 81ca8ed4c6]]
Former-commit-id: 559db09b22e37642d03476bd447ec4aa342fe2ad [formerly bdbdfdaa7a]
Former-commit-id: 1a976cb67b
|
2014-05-27 14:56:33 -05:00 |
|
Steve Harris
|
cf2950abdb
|
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: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
|
2014-05-27 14:48:24 -04:00 |
|
Kenneth Sperow
|
1b837bed5d
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly 189e3cc1f2 [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: 5e3a370777 [formerly 6f8b069dbe] [formerly 8490f7ea33] [formerly 5e3a370777 [formerly 6f8b069dbe] [formerly 8490f7ea33] [formerly 9fa9425aea [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 186b8987ed [formerly 7302462544] [formerly 32e40a5886b016193ab4c39a18d36a93d1143fdb [formerly 846395fd42]]
Former-commit-id: bd2d790b3e0fdcecb8c3759c0035a981ed6db7b1 [formerly 51b0b4e566]
Former-commit-id: 386365e3cb
|
2014-05-22 14:16:49 -07:00 |
|
Brad Gonzales
|
8a5466edce
|
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: b0e8fea5d2 [formerly 7d84f97bf8] [formerly 165f9a6e45] [formerly b0e8fea5d2 [formerly 7d84f97bf8] [formerly 165f9a6e45] [formerly 1dd2a8bf65 [formerly 165f9a6e45 [formerly 71e43fad4acee381d7ffb7ca8ba0438283cd99f6]]]]
Former-commit-id: 1dd2a8bf65
Former-commit-id: 2fa3979515 [formerly 07aa2f5871] [formerly 401a4555f0e94cf5cdd822b453909e28bf5296ca [formerly de22cb1649]]
Former-commit-id: b56731f70caf18eb0566718839672c42ad09e9fe [formerly a3a02dcc3a]
Former-commit-id: 4599cb6e4a
|
2014-05-21 15:22:58 -05:00 |
|
Brian.Dyke
|
4671c25ea4
|
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: 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3]
Former-commit-id: b0b377e811
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
0febfec9e7
|
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: 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f]
Former-commit-id: 1d53f6d304
|
2014-05-14 16:08:16 -04:00 |
|
Brian.Dyke
|
db6b79a08f
|
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: e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: bdbb6ec0fe [formerly f9474b087e] [formerly adafd612a1e8c387205bf9a2e7dcfd2a03d117c9 [formerly 0311366ffb]]
Former-commit-id: 4d9e420076ab9a3d2cb731f4d97896138289b45b [formerly 3b7a2f1645]
Former-commit-id: 4cedfadd77
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
24df80c520
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
|
2014-05-12 16:13:19 -05:00 |
|
Ana Rivera
|
73dc79feda
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 49512f29bf [formerly 7e74e047a0] [formerly 91715e7a3f] [formerly 49512f29bf [formerly 7e74e047a0] [formerly 91715e7a3f] [formerly 81a9d4fa44 [formerly 91715e7a3f [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]]]
Former-commit-id: 81a9d4fa44
Former-commit-id: 950ceec5ef [formerly e33c6e2d69] [formerly 895faa71ddb8f2d028597a09ba5b9d1586644e9d [formerly 88520fc206]]
Former-commit-id: 520cb0cff082dafca89cc471443ec0532a3e3db4 [formerly 8cb1bfc3b8]
Former-commit-id: 94ceb3698f
|
2014-05-12 18:55:06 +00:00 |
|
Brian.Dyke
|
9bc1055c87
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
|
2014-05-12 14:07:11 -04:00 |
|