Commit graph

586 commits

Author SHA1 Message Date
Shawn.Hooper
249b05d610 ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: 31c1d24165 [formerly c715bdd83a] [formerly 285e4baaec] [formerly 31c1d24165 [formerly c715bdd83a] [formerly 285e4baaec] [formerly 9332029a6d [formerly 285e4baaec [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]]]
Former-commit-id: 9332029a6d
Former-commit-id: 19238b4078 [formerly 01ba6f2df0] [formerly 0288bced58afb5bd1fe2fa083727a6ec5abd6139 [formerly 0b0b922968]]
Former-commit-id: 4a60e0a5206b9f29a194cf60232326289f5a4ec4 [formerly 017fd9461d]
Former-commit-id: bd561efdaa
2014-10-30 09:58:02 -04:00
Shawn.Hooper
08513a31e5 ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: 0a737d7605 [formerly 114ff128ed] [formerly 0e372cd13e] [formerly 0a737d7605 [formerly 114ff128ed] [formerly 0e372cd13e] [formerly 3b4b9d262a [formerly 0e372cd13e [formerly e29cf5a57591e5a25b6e73b267c0abb46e9f95c2]]]]
Former-commit-id: 3b4b9d262a
Former-commit-id: 6553dd930b [formerly b1426303fa] [formerly 316973a00d42544ed358ceb26bd0c4fc73613a5c [formerly d62f27cae6]]
Former-commit-id: a4fec6b5cd213bd8e5b65d1b564284ccaae6678c [formerly cc74b6bb2c]
Former-commit-id: ed790d1a7a
2014-10-22 14:47:42 -04:00
Shawn.Hooper
dd78e0b2c9 ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

Former-commit-id: 9be238d949 [formerly 26054621ca] [formerly d0fba5965b] [formerly 9be238d949 [formerly 26054621ca] [formerly d0fba5965b] [formerly a96693cb70 [formerly d0fba5965b [formerly 94872b496bec6c427030ea353856466809d2e6c1]]]]
Former-commit-id: a96693cb70
Former-commit-id: 1bb8b3ea7b [formerly 78cd702d20] [formerly 5aee7a96042ff815ece4420368bedf9e6903ba6e [formerly f98e05c9de]]
Former-commit-id: fe9a6c7c335190ddf8637bb1a75098279d9e09a1 [formerly b99895779f]
Former-commit-id: 490cb64a41
2014-10-21 11:17:45 -04:00
Shawn.Hooper
4e478bcbb2 ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82

Former-commit-id: 3357578661 [formerly 217f39ee04] [formerly e24cb3c37e] [formerly 3357578661 [formerly 217f39ee04] [formerly e24cb3c37e] [formerly 65065f2380 [formerly e24cb3c37e [formerly f72ec046e98bdb6734dbce10ef472dd5294c59ba]]]]
Former-commit-id: 65065f2380
Former-commit-id: 6d8a43b18b [formerly c491bf611e] [formerly e0e56fce59d72735378c58f1a382174e1a922e1b [formerly e50becc648]]
Former-commit-id: 64c59f9d5eb478aa65cc5785f61b776f44dc9aa9 [formerly 17f88aad75]
Former-commit-id: 82afe46187
2014-10-20 14:36:31 -04:00
Brian.Dyke
1e0d10a21c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4cfcb51852 [formerly 498abd3716] [formerly 418894a17b] [formerly 4cfcb51852 [formerly 498abd3716] [formerly 418894a17b] [formerly 93df82ac92 [formerly 418894a17b [formerly f0f79fb324665245ef759947d24514a6c8bc4470]]]]
Former-commit-id: 93df82ac92
Former-commit-id: 471e3f6a7b [formerly bde528063d] [formerly c21ff59cdf15c4c916761f275e34b868583f6dfa [formerly 8af5c9870e]]
Former-commit-id: 9d615abd9636830c9512e42d79d255eeba72db41 [formerly a71dcd88c4]
Former-commit-id: 70568c04be
2014-10-16 12:04:27 -04:00
Sean.Webb
fd0dc9410e ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd

Former-commit-id: eed9457e01 [formerly b256e04c45] [formerly 36d39be5fd] [formerly eed9457e01 [formerly b256e04c45] [formerly 36d39be5fd] [formerly 5f6c9bc837 [formerly 36d39be5fd [formerly c11e78b57bca7d242d4d8c29dc51669d7aebb37d]]]]
Former-commit-id: 5f6c9bc837
Former-commit-id: 52e6f68a3c [formerly cbdb5b8911] [formerly 1a7be974d3087ff2cfeb0d973807e8aaa63d6774 [formerly 1cbbc5bd59]]
Former-commit-id: c1dd27327aab245b131b8dce18d9889072684a10 [formerly 8755e96919]
Former-commit-id: e42e731341
2014-10-16 10:38:14 -05:00
Ana Rivera
88c0382d8a VLab Issue #5014; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614

Former-commit-id: 3b5fd4499b [formerly ee4cdc015f] [formerly f516cc441d] [formerly 3b5fd4499b [formerly ee4cdc015f] [formerly f516cc441d] [formerly 927b2dea69 [formerly f516cc441d [formerly 721938a9fd9a270a2b886eb19de6df70fd62555d]]]]
Former-commit-id: 927b2dea69
Former-commit-id: 7fc3016143 [formerly 99974b81bc] [formerly d07596f046cf735ce306ef4b687390b676f3c29a [formerly ad412ebf94]]
Former-commit-id: f90fd76c0460ad6b8214c502e3081b369ebb0e81 [formerly 9d73c2b3ea]
Former-commit-id: bda3a5fb4e
2014-10-15 18:41:58 +00:00
dmsys
6b2eccce36 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
2014-09-30 13:45:54 -04:00
Brian.Dyke
ade65cb1ab Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: b89a2459ee [formerly 9661a1d7b1] [formerly 0c1b83b644] [formerly b89a2459ee [formerly 9661a1d7b1] [formerly 0c1b83b644] [formerly 0e0255ce5b [formerly 0c1b83b644 [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]]]]
Former-commit-id: 0e0255ce5b
Former-commit-id: 1cc416b17b [formerly 3b3e81d4a2] [formerly e1d7c0bc2a75cdb11de7602ec3d70def4a84dc95 [formerly 77e8985bdd]]
Former-commit-id: b95dc8cf8203e0355bb74fbd1477f87572b22689 [formerly 7bcee86aa2]
Former-commit-id: 5a3c7d3510
2014-09-29 11:55:16 -04:00
Brian.Dyke
ab1f21c096 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]]
Former-commit-id: 46af1d0857
Former-commit-id: ad3338e07f [formerly 886c1b7e3d] [formerly 9fc151f40941f9cab99d6eb050662408c5746324 [formerly 85676ff532]]
Former-commit-id: 0acefdbae8bda17deeb120ade9ca40a2e782cfaa [formerly 4d5f7db303]
Former-commit-id: 23450210b1
2014-09-29 11:20:57 -04:00
Sean.Webb
9d0e79bb1d ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225

Former-commit-id: d3df1699db [formerly 224cddfe9b] [formerly 02e187a609] [formerly d3df1699db [formerly 224cddfe9b] [formerly 02e187a609] [formerly 600b75bd9f [formerly 02e187a609 [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]]]]
Former-commit-id: 600b75bd9f
Former-commit-id: 9c5957ef9f [formerly 1538817a38] [formerly f41e6444ab2ff3f5348a13f52e0f8be3af16c39c [formerly 293f860e93]]
Former-commit-id: e39674a87d4139148f14864f620545df8022ec71 [formerly f80a90d69f]
Former-commit-id: e45ec5cac9
2014-09-29 10:24:04 -04:00
Sean.Webb
89aa38db4a ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683

Former-commit-id: 86382f5396 [formerly 6840d55343] [formerly 0738a41cbf] [formerly 86382f5396 [formerly 6840d55343] [formerly 0738a41cbf] [formerly 78f83fa594 [formerly 0738a41cbf [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]]]]
Former-commit-id: 78f83fa594
Former-commit-id: 88580b8666 [formerly d70bc9fd9f] [formerly 7d13704772f862b4d8ca1264bf50de7ba0cbcd2d [formerly 197908686e]]
Former-commit-id: 079aaf5290e12bd890cc6e5d9fb1b9599c781840 [formerly c69f833921]
Former-commit-id: b7bae10212
2014-09-29 08:21:00 -04:00
Sean.Webb
6f25dd644f ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5

Former-commit-id: b186a8e714 [formerly eb959d100a] [formerly 628ab54d68] [formerly b186a8e714 [formerly eb959d100a] [formerly 628ab54d68] [formerly 7d75d994c1 [formerly 628ab54d68 [formerly d59054c870fee17076aec22cd683ef1586a153da]]]]
Former-commit-id: 7d75d994c1
Former-commit-id: b8d4676a9d [formerly 9b63e571a7] [formerly d1d9f82966b42c43a0e84a2a3cb4b7703be092c9 [formerly 039619264f]]
Former-commit-id: fe4b07e604c1f035cc4a768f1adcaba533724766 [formerly 16b034a9e1]
Former-commit-id: dfdd922054
2014-09-26 10:49:37 -04:00
Brian.Dyke
b8b9d3105b Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	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
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: e16e6e5a2a [formerly cf8f88a5b3] [formerly cd9613c4078591bf28ad1064690bfbbbf551cbaa [formerly 1f09dad9e9]]
Former-commit-id: c0bfed574e2fa14299c865bac77af847704ef3c7 [formerly 8997f79ae4]
Former-commit-id: c22973f909
2014-09-24 11:05:37 -04:00
Sean.Webb
8fafbd5864 ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37

Former-commit-id: 8c41cb256d [formerly be3bb99abe] [formerly 00479a436d] [formerly 8c41cb256d [formerly be3bb99abe] [formerly 00479a436d] [formerly a9dddb44ce [formerly 00479a436d [formerly 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36]]]]
Former-commit-id: a9dddb44ce
Former-commit-id: dd5d61e33d [formerly 8c2044b91e] [formerly 1283a5fbd8fbcf7377715f639509217bd8db178f [formerly df7e6a9ad2]]
Former-commit-id: 511a2d6a81fe2234c359be57d267eadde6fbc04b [formerly 9f22c26d38]
Former-commit-id: 2f0e866285
2014-09-22 14:10:28 -04:00
Sean.Webb
4590cd4f4b ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2

Former-commit-id: c32fde89f9 [formerly 07589bbdda] [formerly 47aef24f6f] [formerly c32fde89f9 [formerly 07589bbdda] [formerly 47aef24f6f] [formerly 4c936b9bc8 [formerly 47aef24f6f [formerly 721bead655f9a384ea12444617774b7ef404feb0]]]]
Former-commit-id: 4c936b9bc8
Former-commit-id: d2b3641bc8 [formerly 79431d7f1d] [formerly 83b31eab4d2587b3082902561edec8cec766b707 [formerly 56b09560ff]]
Former-commit-id: 5bf69c0782b13d23d3c5261a5a8aea4cf2b7f58a [formerly 7da8b68a22]
Former-commit-id: dcbb4f82f9
2014-09-22 07:18:21 -04:00
Sean.Webb
050af275c7 ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275

Former-commit-id: e3ad9053d7 [formerly 502f7520a7] [formerly 4368f4650b] [formerly e3ad9053d7 [formerly 502f7520a7] [formerly 4368f4650b] [formerly e0abd14986 [formerly 4368f4650b [formerly 5c541f50dcc68a856e8c81bff8577334abf1ff75]]]]
Former-commit-id: e0abd14986
Former-commit-id: 6734ed0a24 [formerly ddcc0fa20a] [formerly 3c6f69f29e4f9f9da55dc92943f38d19a2561e69 [formerly 23ec020b8d]]
Former-commit-id: 433e63ebca5e54341033773da1f756c4a02e0d17 [formerly eb5a76cfe8]
Former-commit-id: d49f49f805
2014-09-19 13:43:45 -04:00
Sean.Webb
1c74767e93 ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b

Former-commit-id: c061f7b1a0 [formerly c90c45f303] [formerly b0b01694f7] [formerly c061f7b1a0 [formerly c90c45f303] [formerly b0b01694f7] [formerly 6ffb17540e [formerly b0b01694f7 [formerly 031c41d4f7801c8a5127cf007358856bf771593a]]]]
Former-commit-id: 6ffb17540e
Former-commit-id: 28d64b103e [formerly f2e207e86e] [formerly cd684d9da149567c3e25ae1ec02c6dba3ad9ab95 [formerly f808f0840d]]
Former-commit-id: 4e828548865f894bac34d45562f6859074140db6 [formerly a023244a62]
Former-commit-id: 1b848836ce
2014-09-19 09:29:31 -04:00
Sean.Webb
788834162c ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c

Former-commit-id: 90fbb6bf28 [formerly 7f898635f9] [formerly 5c84cadaf6] [formerly 90fbb6bf28 [formerly 7f898635f9] [formerly 5c84cadaf6] [formerly 51380a2363 [formerly 5c84cadaf6 [formerly 165b9a9b3481b3fa1d31b771eead03180430be59]]]]
Former-commit-id: 51380a2363
Former-commit-id: 620380c79d [formerly a651c7ea69] [formerly 4e6bbc221847b4a3a5b6046d9f84f9c01130927a [formerly 10f14f8032]]
Former-commit-id: 252796d7bbfccbfce225e3fbb59de5cc643dd6b8 [formerly ded5ad2e48]
Former-commit-id: 4fdd58193c
2014-09-19 07:25:18 -04:00
Sean.Webb
75bc66ecfb ASM #16761 - Updated ldm spec to add retrans
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229

Former-commit-id: 57553e3c5a [formerly b959842361] [formerly 35bfd8269c] [formerly 57553e3c5a [formerly b959842361] [formerly 35bfd8269c] [formerly 4c36280560 [formerly 35bfd8269c [formerly bb9d431a842511b0081660224f3ddefd947f76fd]]]]
Former-commit-id: 4c36280560
Former-commit-id: 622231e99f [formerly b625f2067a] [formerly bfb3fdfda5d267aca3d541fa86f2aee946e40185 [formerly 827386e60d]]
Former-commit-id: c06ddd91eb8b18b1557f00bc050d561a2e5db5c8 [formerly 9058ab3282]
Former-commit-id: 7268c9b042
2014-09-18 09:33:47 -04:00
Stephen Gilbert
9d6570b9f5 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: aa11ac6e09 [formerly e7d21b0293] [formerly 5bf2ed644a] [formerly aa11ac6e09 [formerly e7d21b0293] [formerly 5bf2ed644a] [formerly 440bddda4b [formerly 5bf2ed644a [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]]]
Former-commit-id: 440bddda4b
Former-commit-id: d9a222f1ef [formerly 1ceed41334] [formerly 0680c0d2a7310de845600fb7564e790bfd925534 [formerly eee81971cc]]
Former-commit-id: 468aa5036ea727433d05f2dfe4b23fee88875480 [formerly 3106a4006c]
Former-commit-id: 99796454d2
2014-09-15 13:20:34 -04:00
Sean.Webb
dc158de44d ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib005b9e9af0979d4aa1463e5555fd7b42c7fcc89

Former-commit-id: 4b10cf2f9f [formerly 268db31231] [formerly c805e132bd] [formerly 4b10cf2f9f [formerly 268db31231] [formerly c805e132bd] [formerly 5918cb05c1 [formerly c805e132bd [formerly f07bb36b5f5e01000345a37719e43cb2df4ea7d8]]]]
Former-commit-id: 5918cb05c1
Former-commit-id: 519ea8fcc7 [formerly 55190a347f] [formerly a053c76757b4171b24e63c33b3571659f5309b58 [formerly 213208cbf2]]
Former-commit-id: 599092cbdfc728368ca6d2520284aa5bd41b7a3a [formerly b36a1fdde0]
Former-commit-id: ff50aaf81d
2014-09-11 15:13:58 -04:00
Sean.Webb
95cc346e3f ASM #16720 - Updated to ldm 6.12.6
Change-Id: I39f4a529c18995e2b400afbaf0b36fbe7d30d001

Former-commit-id: a59dce026a [formerly dec97cd06f] [formerly 928c334c03] [formerly a59dce026a [formerly dec97cd06f] [formerly 928c334c03] [formerly a6c15ca070 [formerly 928c334c03 [formerly fb95ea372530d699c4681cf8ec9e3abce23716c1]]]]
Former-commit-id: a6c15ca070
Former-commit-id: 760661ee73 [formerly d1614ae327] [formerly cf7da60d3066e6b91203dcc0dc39c56cff325666 [formerly 6fa9e92a8c]]
Former-commit-id: 8a7c2071b5f15c57de7f1dc6c604ebc213b7c50d [formerly 6299e7382e]
Former-commit-id: 0d1375ba3d
2014-09-11 14:18:50 -04:00
Sean.Webb
72ca384247 ASM #16720 - Updated to ldm 6.12.6
Change-Id: Icf050791541832b370f7d8ceb7a423b500a62d51

Former-commit-id: c2e613e9f1 [formerly eb5418a3bb] [formerly dfc004e1f0] [formerly c2e613e9f1 [formerly eb5418a3bb] [formerly dfc004e1f0] [formerly 0e72b63663 [formerly dfc004e1f0 [formerly 8b1b91c79fa7e59610e21f11af3babaf120859e4]]]]
Former-commit-id: 0e72b63663
Former-commit-id: 7a31d0ea28 [formerly e186b2723d] [formerly 1e51b8d6e3ce391ff3127b0380a070f8ea54d789 [formerly 991ea6c13b]]
Former-commit-id: 9d48fc8d039297aa30f20737d9adebe622f7224f [formerly f98fbd8e99]
Former-commit-id: 5fe337b6bf
2014-09-11 13:39:17 -04:00
Stephen Gilbert
630efbf2f9 Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
	cave/build/cave/customTargets.xml
	edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
	ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
	ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
	ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties

Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6

Former-commit-id: d98c1adc91 [formerly 2406f0786f] [formerly 561b751e58] [formerly d98c1adc91 [formerly 2406f0786f] [formerly 561b751e58] [formerly 662436c2d5 [formerly 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]]]
Former-commit-id: 662436c2d5
Former-commit-id: c3e1eebd6d [formerly 3251e256c6] [formerly 4940723817b19e437897ef6ec6d862340b0a86f7 [formerly a631e61fe5]]
Former-commit-id: 3248a201641e504c0b9e17abd8322cce5f5a0486 [formerly bbabe5d087]
Former-commit-id: 2679b9ef8d
2014-09-11 11:14:33 -04:00
Sean.Webb
854c00cab3 ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib4c4689eb32f298b8be8782d878c243689608f6a

Former-commit-id: 4850be3f96 [formerly bc6f7cfa3f] [formerly db156a51de] [formerly 4850be3f96 [formerly bc6f7cfa3f] [formerly db156a51de] [formerly 71d128a180 [formerly db156a51de [formerly ded6663441d8b916ad5b45f2668feac431e84bce]]]]
Former-commit-id: 71d128a180
Former-commit-id: 314694f6fb [formerly ce7bae10ea] [formerly b7acedd41364c684cc15e350507c87281fc5b316 [formerly 2683f36e09]]
Former-commit-id: aad85b79c2b5ba889033b2d1b2d83fd6cf630f19 [formerly d03c5a03fc]
Former-commit-id: b5b7f5622b
2014-09-10 14:48:19 -04:00
Brian.Dyke
0c715b7439 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: a344be95c8 [formerly 5415a4939a] [formerly 858b91d677] [formerly a344be95c8 [formerly 5415a4939a] [formerly 858b91d677] [formerly af477df90e [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]]
Former-commit-id: af477df90e
Former-commit-id: 4582533601 [formerly dde3efc567] [formerly f892d9608dc1fb65163dac3714b16398a7d89022 [formerly 6c4b121752]]
Former-commit-id: 2c8a415a8d01954bd8f0e11fa551974a70c7759e [formerly 66c4758f2d]
Former-commit-id: b42aba7839
2014-09-08 14:54:16 -04: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
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
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
Stephen Gilbert
c5e96fc84b VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
NcText decoder updates and other ingest config changes

Change-Id: I1dca245ff36c565c924a494eae3f1a2b834f43ac

Former-commit-id: 8e79558516 [formerly 22649088f1] [formerly c16e83f25a] [formerly 8e79558516 [formerly 22649088f1] [formerly c16e83f25a] [formerly f94a3aadf4 [formerly c16e83f25a [formerly 9e47362ce407ea03c0ede8884baa7e8129d2d646]]]]
Former-commit-id: f94a3aadf4
Former-commit-id: fd21da0260 [formerly fb15dd0e6f] [formerly e4eb3c41ebd4b5b1a7377dfb8f7fae449501df2c [formerly 55ba6aad6b]]
Former-commit-id: ed226723cb44dfc564bec82ed8857032c93c2b73 [formerly 6c028cf3e5]
Former-commit-id: 94388db0e5
2014-07-23 15:51:27 -04:00
Ana Rivera
1323571625 VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 53b72f2fd8 [formerly 9670521c07] [formerly c10b50d0b2] [formerly 53b72f2fd8 [formerly 9670521c07] [formerly c10b50d0b2] [formerly 088ebd2ca2 [formerly c10b50d0b2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]]]]
Former-commit-id: 088ebd2ca2
Former-commit-id: aaaaeedef9 [formerly 5a764dff66] [formerly ad7e3ffa1b2fc1c7437851259989b79129848438 [formerly 752bc11851]]
Former-commit-id: ef2e493f9412fcf09cbbc3350571fb84dcf7d786 [formerly 0eb194e2bb]
Former-commit-id: 462749040d
2014-07-21 21:41:17 +00: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
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