xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8170 commits 31 branches 40 tags 3.8 GiB
Commit graph

794 commits

Author SHA1 Message Date
Joshua Watson
0f8e1b0278 VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129 
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: 85d67b46ce [formerly 0d02d676b4] [formerly 0c8b629c96] [formerly 0c8b629c96 [formerly a8f5bb480b]] [formerly 85d67b46ce [formerly 0d02d676b4] [formerly 0c8b629c96] [formerly 0c8b629c96 [formerly a8f5bb480b]] [formerly bca4b40eed [formerly 0c8b629c96 [formerly a8f5bb480b] [formerly bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]]]]
Former-commit-id: bca4b40eed
Former-commit-id: 83bd8b8b23 [formerly 1c99832ab2] [formerly ce1476d78f] [formerly ae90f314107c3ecc35a67708c407f9d1c65164f5 [formerly ddff465e08a2a953e3178779f582e8f0d1f8ea23] [formerly ce1476d78f [formerly 9383635749]]]
Former-commit-id: 95444fc3749b73eae8a61b29a64ad32ac137ba73 [formerly 2a340305564d3a45aecb6fbfe0c24d468ebd50cc] [formerly 8789ca8e8e [formerly 33e4b8bc88]]
Former-commit-id: 8789ca8e8e
Former-commit-id: b423dc7745
 2014-12-11 11:39:00 -05:00
Bryan Kowal
b0b22ad048 Omaha #3914 - increment yajsw release 
Former-commit-id: c61562ebf8 [formerly 1249cd8a28] [formerly c2e0b33c19] [formerly c2e0b33c19 [formerly aad5e554b9]] [formerly c61562ebf8 [formerly 1249cd8a28] [formerly c2e0b33c19] [formerly c2e0b33c19 [formerly aad5e554b9]] [formerly 0b65eb314d [formerly c2e0b33c19 [formerly aad5e554b9] [formerly 0b65eb314d [formerly 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a]]]]]
Former-commit-id: 0b65eb314d
Former-commit-id: c9566857a3 [formerly bc57b285f3] [formerly 544c5e39eb] [formerly 7bded32e8a0e40d80e6c1fb3a21e40f076f68656 [formerly 6a88a0c7e0d5a026903c015567666e9ed2cdde95] [formerly 544c5e39eb [formerly 9efc72561b]]]
Former-commit-id: 44803e53f8a0173d74d3d4eee854e8beecd98465 [formerly 608ce9f326f155f2a382a4fe899e3b5510518fcb] [formerly 7279d157bb [formerly e3bad2212b]]
Former-commit-id: 7279d157bb
Former-commit-id: 1176ffa1ad
 2014-12-10 10:34:26 -06:00
Brian Graham
faad6d3cc7 ASM #15662 - Updated spec files to include AWIPS version 
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f

Former-commit-id: c7311f89a4 [formerly 97bf1ddbd6] [formerly aabc38c52c] [formerly aabc38c52c [formerly 99143e0045]] [formerly c7311f89a4 [formerly 97bf1ddbd6] [formerly aabc38c52c] [formerly aabc38c52c [formerly 99143e0045]] [formerly e1b4c4abe3 [formerly aabc38c52c [formerly 99143e0045] [formerly e1b4c4abe3 [formerly 11741b03db9424aa10086553729303fa23a7366f]]]]]
Former-commit-id: e1b4c4abe3
Former-commit-id: db5304a989 [formerly 22e53eca19] [formerly 29912607c9] [formerly 58e94bdd90ae6a653b014b5a62ecb917d84cdc1f [formerly 6ab29ce6401f1bdd9988b72b8136d6f7030cc71b] [formerly 29912607c9 [formerly 24ca442651]]]
Former-commit-id: a57c85053413cd827bfe203ab08457a2721efba9 [formerly dda449188d7535ab185d69024efd9c2005a2a4d7] [formerly 963b52651e [formerly 10fd784dd7]]
Former-commit-id: 963b52651e
Former-commit-id: 6fd5a319dc
 2014-12-09 09:25:59 -05:00
Bryan Kowal
13f7b68f10 Omaha #3508 - remove references to yajsw in %files 
Former-commit-id: f08b3d88e1 [formerly 121f1068ca] [formerly 16a33efd8b] [formerly 16a33efd8b [formerly 9e55db1c52]] [formerly f08b3d88e1 [formerly 121f1068ca] [formerly 16a33efd8b] [formerly 16a33efd8b [formerly 9e55db1c52]] [formerly 9e77b9635e [formerly 16a33efd8b [formerly 9e55db1c52] [formerly 9e77b9635e [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]]]]
Former-commit-id: 9e77b9635e
Former-commit-id: dafadb1cf8 [formerly e1a62ff167] [formerly 5644901634] [formerly b34ab4ba57c656fa0b2a5c9146fa51b8e9de62f6 [formerly 9d2131c1c4195c68ae2b4242ce29d62a04093299] [formerly 5644901634 [formerly 7575599185]]]
Former-commit-id: fd087f0508a0dec6c4ad0153efd9740a82fb6650 [formerly 336cd43d4b46abfdcfc533ea65ab126e5d21c0c7] [formerly 3ec292bebb [formerly cc4ee08244]]
Former-commit-id: 3ec292bebb
Former-commit-id: d66c1a0d43
 2014-12-05 10:04:42 -06:00
Bryan Kowal
40199ea8d0 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 
Former-commit-id: 0f1c84b46e [formerly 4aaf636e18] [formerly 289689e774] [formerly 289689e774 [formerly 19f6551c88]] [formerly 0f1c84b46e [formerly 4aaf636e18] [formerly 289689e774] [formerly 289689e774 [formerly 19f6551c88]] [formerly 48ec32e595 [formerly 289689e774 [formerly 19f6551c88] [formerly 48ec32e595 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]]]
Former-commit-id: 48ec32e595
Former-commit-id: bbb1e67206 [formerly 0e79d9e7a8] [formerly aba4679eb6] [formerly ea0e9d37d6d11e1e8d4379a55dc0bf98106f91c5 [formerly 39a25df1c5ea9e51a812bdbf1ec764e207623861] [formerly aba4679eb6 [formerly 9f5297504d]]]
Former-commit-id: 0df49c9e4329a09327147fbfcfd17daf40ce8689 [formerly 53663102c30f8e33519ac669cb7464894a692105] [formerly 258f7a93ca [formerly ec8371db52]]
Former-commit-id: 258f7a93ca
Former-commit-id: 4b83570666
 2014-12-05 09:20:23 -06:00
Greg Armendariz
e5c9bdd6da Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1 
Former-commit-id: 365dbb4d4f [formerly 1a012a8f2f] [formerly f6f50778c7] [formerly f6f50778c7 [formerly 8803a6b658]] [formerly 365dbb4d4f [formerly 1a012a8f2f] [formerly f6f50778c7] [formerly f6f50778c7 [formerly 8803a6b658]] [formerly 610f38e9ef [formerly f6f50778c7 [formerly 8803a6b658] [formerly 610f38e9ef [formerly 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23]]]]]
Former-commit-id: 610f38e9ef
Former-commit-id: 7287c8d87f [formerly 454c1dcb41] [formerly 1e78bd8898] [formerly 247e2ca7b491f389d8bc111ac83853c574380e27 [formerly dabc9cf0e8e74314f2e2e24ec4c11673a0e14567] [formerly 1e78bd8898 [formerly f307a34150]]]
Former-commit-id: 784bdcbdb9f9b46b338f4942145069b5161fe48e [formerly f472aef732b56a3a4aefb9bac194affa57f16a81] [formerly f1b203fec9 [formerly 2d6ab26fd8]]
Former-commit-id: f1b203fec9
Former-commit-id: dd148483ef
 2014-12-05 08:57:37 -06:00
Greg Armendariz
cc9220f7b6 Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1 
Former-commit-id: 690939f722 [formerly 7bced64c28] [formerly 73e48f7b1d] [formerly 73e48f7b1d [formerly 83ca3b5381]] [formerly 690939f722 [formerly 7bced64c28] [formerly 73e48f7b1d] [formerly 73e48f7b1d [formerly 83ca3b5381]] [formerly ed42ecc0e8 [formerly 73e48f7b1d [formerly 83ca3b5381] [formerly ed42ecc0e8 [formerly f310e13350ba8e64e313d99a7d03d0ef3cdc6aba]]]]]
Former-commit-id: ed42ecc0e8
Former-commit-id: 958ddb53f5 [formerly 518ef4c163] [formerly 1fac1cb693] [formerly 26cd336b3df4f2111870ee770b8e8b6f901935a0 [formerly 4d41ce12fd5f33bd7913ebd71be136c2621dc917] [formerly 1fac1cb693 [formerly 9883443470]]]
Former-commit-id: caab7e90a622cddb298fcd7f16c8c427e8e7704f [formerly f844a80c211f026af98a63f62c6b006de937a9f7] [formerly c3008b22d6 [formerly c87e692d9c]]
Former-commit-id: fdfe4a2c3c8fa198fc29a8545b72e052c892ae8d [formerly c3008b22d6]
Former-commit-id: d3f556a0fb
 2014-12-05 08:57:08 -06:00
Bryan Kowal
a5d1e4ea53 Omaha #3508 - purge non-centralized yajsw distributions 
amend: ensure edex is dependent on yajsw

Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55

Former-commit-id: 8f23ca3ec3 [formerly 2d7a7eff76] [formerly cf5353e368] [formerly cf5353e368 [formerly 71cf313666]] [formerly 8f23ca3ec3 [formerly 2d7a7eff76] [formerly cf5353e368] [formerly cf5353e368 [formerly 71cf313666]] [formerly 0894efaaa3 [formerly cf5353e368 [formerly 71cf313666] [formerly 0894efaaa3 [formerly 9b36754ca610887a17666ceff2a1540b958913b6]]]]]
Former-commit-id: 0894efaaa3
Former-commit-id: 53c9351bc9 [formerly 77df8dc255] [formerly 3c95967633] [formerly 96a79a42a93479dc0eb1896a782adebe515a6db5 [formerly 9bb0a44417e13105470dc2e5a1115eb08b637a95] [formerly 3c95967633 [formerly ccb7cead64]]]
Former-commit-id: d2acab2c99308217035018b039b3d892a6a5a495 [formerly c6b73d52be1b51f01ea0bed574f9958d08a3cbf9] [formerly 8ac5284fff [formerly d55f5e0c63]]
Former-commit-id: 8ac5284fff
Former-commit-id: 0c1ec8e447
 2014-12-04 17:33:43 -06:00
Bryan Kowal
391efe64ba Omaha #3508 - created the yajsw rpm 
Former-commit-id: 3ead49d98a [formerly d1ae8959d9] [formerly a89e9d96b9] [formerly a89e9d96b9 [formerly 8be5362dbd]] [formerly 3ead49d98a [formerly d1ae8959d9] [formerly a89e9d96b9] [formerly a89e9d96b9 [formerly 8be5362dbd]] [formerly 127db6aaee [formerly a89e9d96b9 [formerly 8be5362dbd] [formerly 127db6aaee [formerly 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21]]]]]
Former-commit-id: 127db6aaee
Former-commit-id: fa66a7ae30 [formerly a66bd674bd] [formerly aa0f4129c4] [formerly 7b4b4fa51db79a7a07123e02867c44e8a0319f36 [formerly 3eadda817d8defa22fb56beb2929a690f89c1d99] [formerly aa0f4129c4 [formerly c3bb142d88]]]
Former-commit-id: 8f2ab1db98c7e94d5d0cde110fd2c6b4d40d3c07 [formerly baa6b945182280fb3280c32ab3139fed2fa645e0] [formerly 40434c2d72 [formerly 27686d8783]]
Former-commit-id: 40434c2d72
Former-commit-id: c529dfdcb5
 2014-12-04 16:26:55 -06:00
Shawn.Hooper
5a11073ba4 ASM #16805 - Update component.spec for awips2-java for removal of license.txt file 
Change-Id: I55524734785e63647cba46edb8e15324b794af95

Former-commit-id: f495ffd857 [formerly 91e351340a] [formerly 2abdd00f1b] [formerly 2abdd00f1b [formerly d3f6005946]] [formerly f495ffd857 [formerly 91e351340a] [formerly 2abdd00f1b] [formerly 2abdd00f1b [formerly d3f6005946]] [formerly e4224cd67b [formerly 2abdd00f1b [formerly d3f6005946] [formerly e4224cd67b [formerly dc77d48fc9c9e5183b94bc05321ab0061404a4ff]]]]]
Former-commit-id: e4224cd67b
Former-commit-id: 94fa53bd9c [formerly ff9947af57] [formerly f045c0189d] [formerly 899e15a8affe33fe3606246248ab8387bacc58de [formerly b8462ee3a3079284df9e59b64ceacfd8310dbf24] [formerly f045c0189d [formerly c24d9b2f90]]]
Former-commit-id: 4cb5d215ee906ab4b001d15f705deb38cea7a1ac [formerly 2b684b0f6abaae3722d7c62d73046bc174ce8bed] [formerly a9ee60a81d [formerly 5a8cad715b]]
Former-commit-id: a9ee60a81d
Former-commit-id: da0c0a1ea1
 2014-12-04 16:48:33 -05:00
Fay.Liang
ae90a6e7ea Merge branch 'master_14.3.1' into master_14.3.2 
Former-commit-id: c174ee4a96 [formerly 07316a588b] [formerly f327b9dd5a] [formerly f327b9dd5a [formerly 83a4987188]] [formerly c174ee4a96 [formerly 07316a588b] [formerly f327b9dd5a] [formerly f327b9dd5a [formerly 83a4987188]] [formerly 19194e0aa3 [formerly f327b9dd5a [formerly 83a4987188] [formerly 19194e0aa3 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]]]]
Former-commit-id: 19194e0aa3
Former-commit-id: aca34215ed [formerly 584c23204c] [formerly 3404290a55] [formerly d511e01ba0f1ffe4367150bb15f46594abb1117c [formerly 3f2d96c9d47c4473133453152529dbde17585408] [formerly 3404290a55 [formerly 19d1be03e0]]]
Former-commit-id: 807f15ed0326152986ab29ef96dd3a6d4717ade1 [formerly 3d28581938610d1cb88afa23efdb5a5a730b40b8] [formerly 5f6842175d [formerly d3c8b8a470]]
Former-commit-id: 5f6842175d
Former-commit-id: 7a6f1496e5
 2014-12-04 13:46:31 -05:00
Greg Armendariz
21d3568443 Omaha #3216 - update postgres to use geos 3.4.2 
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b

Former-commit-id: 0ae3102e52 [formerly 89f89f1abc] [formerly 515aa32cc6] [formerly 515aa32cc6 [formerly 6dd90bb25a]] [formerly 0ae3102e52 [formerly 89f89f1abc] [formerly 515aa32cc6] [formerly 515aa32cc6 [formerly 6dd90bb25a]] [formerly 1b1064d541 [formerly 515aa32cc6 [formerly 6dd90bb25a] [formerly 1b1064d541 [formerly 453247c7731adb5e1ca4e58306d14715c0f3a350]]]]]
Former-commit-id: 1b1064d541
Former-commit-id: 2933f01cc3 [formerly 2f8496500c] [formerly fa7fef1605] [formerly 4e05838aa641a099378b5fab3d4e937c39eadf6c [formerly feed9d6199a0610cf7b7a8fbffdc668a8c92580b] [formerly fa7fef1605 [formerly aba34ca613]]]
Former-commit-id: 7e3e08857b46c1bef11f97263b395b5f81a20005 [formerly 9d24b6eddd5555617e59d96ad36b5c1258648b2f] [formerly 532891c6b7 [formerly 88cd053b81]]
Former-commit-id: 9816f94cc5585b7642b76d815bf39cd221474a2c [formerly 532891c6b7]
Former-commit-id: 2095c76ca1
 2014-12-04 11:34:45 -06:00
Greg Armendariz
448278ae63 Omaha #3216 - Increment pypies release number 
Former-commit-id: fa314bac2c [formerly 507fdb67f7] [formerly 0650a941b1] [formerly 0650a941b1 [formerly 7ac9281ba6]] [formerly fa314bac2c [formerly 507fdb67f7] [formerly 0650a941b1] [formerly 0650a941b1 [formerly 7ac9281ba6]] [formerly 44af2c4ff1 [formerly 0650a941b1 [formerly 7ac9281ba6] [formerly 44af2c4ff1 [formerly 0497a64f539e716089736597385ff9ff3d18e5c0]]]]]
Former-commit-id: 44af2c4ff1
Former-commit-id: f24f99604b [formerly a296296f61] [formerly f76075c3cc] [formerly 1d3f801c2424cdb020ee135365de3df66a0f9344 [formerly 216f7df76eed40d3231621255f741baf82120d1b] [formerly f76075c3cc [formerly bed2187d35]]]
Former-commit-id: e01b3852e49b63e89ce0789343a7d51f30c581b2 [formerly fe7b56ee7396074ccd1deb3543eed6674c812758] [formerly c561bcc4e2 [formerly 2b3b672618]]
Former-commit-id: c561bcc4e2
Former-commit-id: dd8cc197e5
 2014-12-02 14:45:04 -06:00
mjames-upc
77c8e56416 NCP composite resource group updates. ACARS ingest turned off in pqact.conf. Default ESB modes updated. Minor cleanup for McIDAS decoder. 
Former-commit-id: e566c367c5
 2014-12-01 12:16:47 -07:00
mjames-upc
0750cf2fd6 LDM RPM spec file now updates ldmd.conf with imogene.unidata.ucar.edu post install 
Former-commit-id: d7a05c2a03
 2014-11-26 14:50:49 -07:00
mjames-upc
471a92a5d2 'edex' service manager setup fix for localhost.localdomain returned from HOSTNAME and 192.168 returned from ifconfig 
Former-commit-id: 67807c3889
 2014-11-26 14:43:24 -07:00
mjames-upc
2d26465186 LDM queue size set in RPM post install 
Former-commit-id: b39bd433b7
 2014-11-24 15:59:01 -07:00
Bryan Kowal
2bc510f7c1 Omaha #3695 - PostgreSQL will always provide version 3.3.6 of geos. Version 3.3.6 
of geos is the only version that our current version of postgis will see. Even
when geos 3.3.7 and 3.3.6 are on the path during compilation, postgis will still
be compiled with a dynamic link to both versions of the library even though
there was not a 3.3.6 available during compilation.


Former-commit-id: 2357637650 [formerly d2c77a4f05] [formerly b1bf38f922] [formerly b1bf38f922 [formerly eb52d1b333]] [formerly 2357637650 [formerly d2c77a4f05] [formerly b1bf38f922] [formerly b1bf38f922 [formerly eb52d1b333]] [formerly 700eefe0ee [formerly b1bf38f922 [formerly eb52d1b333] [formerly 700eefe0ee [formerly 2dafcfc4e0350654c30eb077329711259bf12d1f]]]]]
Former-commit-id: 700eefe0ee
Former-commit-id: ddfc589e22 [formerly d2ab658b75] [formerly 4a106ddab1] [formerly 29e351308a083c1abb7f263316daa912f0ef63a4 [formerly 3082d563a5639f5d1596dd07310618999fe4e2f8] [formerly 4a106ddab1 [formerly d40302bf3b]]]
Former-commit-id: 22d102e44031447482a04705f0309b1622ad8fc6 [formerly 6130e089d849076aeb83665330a8df012ad24093] [formerly 33b903d97e [formerly a05d7f7cc1]]
Former-commit-id: 33b903d97e
Former-commit-id: 6577fae70c
 2014-11-24 16:20:34 -06:00
mjames-upc
2215b28841 support added for CIMSS UNIWISC sounder products (PW, LI, CAPE, SST, OZONE). Colormaps and resource definitions added to NCP. 
Former-commit-id: c56fe56217
 2014-11-21 11:38:40 -07:00
mjames-upc
6d4b0bc408 EDEX RPM change permissions on manual data ingest directory 
Former-commit-id: c1d3cad835
 2014-11-21 11:36:31 -07:00
mjames-upc
a2f3d41bc8 LDM product default increased to 1500MB to handle all feeds without dropping products 
Former-commit-id: c9b490228a
 2014-11-21 11:35:41 -07:00
Fay.Liang
d17302893e Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: bccebc77a4 [formerly e1e29a8283] [formerly 069db81e14] [formerly 069db81e14 [formerly 99263f79e1]] [formerly bccebc77a4 [formerly e1e29a8283] [formerly 069db81e14] [formerly 069db81e14 [formerly 99263f79e1]] [formerly 5bd22b74c6 [formerly 069db81e14 [formerly 99263f79e1] [formerly 5bd22b74c6 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]]]]
Former-commit-id: 5bd22b74c6
Former-commit-id: 2b8725200c [formerly 0449d5c18e] [formerly acdabae0ab] [formerly 561803f6874377145c54f41be61b02dd0f07cee9 [formerly c1abcf797358800d9fbd2cfc11c0aaf00f39175c] [formerly acdabae0ab [formerly 7aa08b8ba4]]]
Former-commit-id: c226f6f8891a1b3284d525c108d4bd1a3a2a5b01 [formerly 50eba82349976ac4f816033916b73bb459f7994b] [formerly d7f86a9a63 [formerly 59f64b29b1]]
Former-commit-id: 9a29878840aca8e6a63a51fde92842ae5cdcf5fa [formerly d7f86a9a63]
Former-commit-id: 9f664d7b77
 2014-11-20 13:32:25 -05:00
Shawn Hooper
8f9452b676 VLab Issue #5395 - Build fixes and gfeConfig.py update 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: b053f7f1d7 [formerly c3da295cf3] [formerly fd57e5334c] [formerly fd57e5334c [formerly b7369c5eef]] [formerly b053f7f1d7 [formerly c3da295cf3] [formerly fd57e5334c] [formerly fd57e5334c [formerly b7369c5eef]] [formerly cf72b5753d [formerly fd57e5334c [formerly b7369c5eef] [formerly cf72b5753d [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]]]]
Former-commit-id: cf72b5753d
Former-commit-id: 711aec6c4d [formerly 2647d0da64] [formerly 2f954d65be] [formerly ecb616de32aa06446b6bc09a85152cb960c667a2 [formerly 39d76acba63995c628c757a8a56e7c28e05a4d50] [formerly 2f954d65be [formerly 330eae9f9e]]]
Former-commit-id: 8adcce05a42b54d042ff2b57b71d891d73364443 [formerly f1c2f8e69948210053dc249a42decc8b5669cf29] [formerly 6699c18a7a [formerly b6d1f3aef4]]
Former-commit-id: 6699c18a7a
Former-commit-id: a3014a223e
 2014-11-20 13:12:16 -05:00
Fay.Liang
06c9bf8a31 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 4263a48886 [formerly 2b49d6bc2d] [formerly a32ec39df2] [formerly a32ec39df2 [formerly 29561d5324]] [formerly 4263a48886 [formerly 2b49d6bc2d] [formerly a32ec39df2] [formerly a32ec39df2 [formerly 29561d5324]] [formerly 45b80432d6 [formerly a32ec39df2 [formerly 29561d5324] [formerly 45b80432d6 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]]]]
Former-commit-id: 45b80432d6
Former-commit-id: 0fee857bb0 [formerly 6016bff79f] [formerly a75d5d336d] [formerly 2fda7b18f793a1144192ee52b601da8e4a9e4864 [formerly 99a188c89ce3b28470ca76a3e178a441a2becbc0] [formerly a75d5d336d [formerly de4ab82df7]]]
Former-commit-id: 36d350b264f2b01bab44db871446a967b90c5608 [formerly 5f821e22236c5e9d22f88a48cf10e16ae421decd] [formerly 5c3a6d006c [formerly e61707aefc]]
Former-commit-id: 5c3a6d006c
Former-commit-id: 448e9eda8e
 2014-11-19 22:07:54 -05:00
Shawn Hooper
a4200743ba VLab Issue #5375 - Update spec file for VADATUMS tar file. 
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13

Former-commit-id: cd2c87509a [formerly 8aff77b52b] [formerly 3455a07e99] [formerly 3455a07e99 [formerly 50cd8ace64]] [formerly cd2c87509a [formerly 8aff77b52b] [formerly 3455a07e99] [formerly 3455a07e99 [formerly 50cd8ace64]] [formerly f88d320e60 [formerly 3455a07e99 [formerly 50cd8ace64] [formerly f88d320e60 [formerly 83e81ee0af2d612f08f32e760e9f4d00ee1dd7aa]]]]]
Former-commit-id: f88d320e60
Former-commit-id: a810c12b52 [formerly 07efce840f] [formerly a872090b54] [formerly 4fb5e3a9d10876921e0ce8f534c94df50ab346c4 [formerly 821313f7493c9d20aa3abc7eb756ae69fa0a6d6f] [formerly a872090b54 [formerly 58fed17369]]]
Former-commit-id: 94dd55d77eb136c07b50f22e075886c4e94af4ea [formerly 2a9aba75f3540bf8f26d59a981f468e21bff828c] [formerly da77e0bcd3 [formerly f543901a53]]
Former-commit-id: 622492a97bd5a304b9d307a55b0e56526f083e81 [formerly da77e0bcd3]
Former-commit-id: 32617ce462
 2014-11-19 14:08:27 -05:00
Greg Armendariz
e658b0851d Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build 
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: f6b8d034c3 [formerly 397acc7119] [formerly d3295027c2] [formerly d3295027c2 [formerly ad5e3134e4]] [formerly f6b8d034c3 [formerly 397acc7119] [formerly d3295027c2] [formerly d3295027c2 [formerly ad5e3134e4]] [formerly d7af478037 [formerly d3295027c2 [formerly ad5e3134e4] [formerly d7af478037 [formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]]]]]
Former-commit-id: d7af478037
Former-commit-id: 1f61fc8c58 [formerly a9b0a92197] [formerly fa3eda0370] [formerly be7883dd5ce6f213cf190a9a1d6a7163ba6fb459 [formerly 50e262e3a15040bee7135aa4d01fb597da141d7a] [formerly fa3eda0370 [formerly 756d33bf89]]]
Former-commit-id: a17af78b18e64a71f4d2cbd89ef2b7fcbeebbf1a [formerly 7709850b9549798fe9bbcd8cc7650201a0d0eae5] [formerly a17f0cb3e1 [formerly 1fbd4f0038]]
Former-commit-id: a17f0cb3e1
Former-commit-id: 8a2e543012
 2014-11-18 13:48:19 -06:00
mjames-upc
e16b3db4c9 UNIWISC polar composite reorganization for postgres and NCP resource menus 
Former-commit-id: 72779cf86a
 2014-11-18 11:37:29 -07:00
David Lovely
38737e6577 Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work. 
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325

Former-commit-id: 1022b3a677 [formerly 92f11c79c1] [formerly 132ac21917] [formerly 132ac21917 [formerly e0525f7816]] [formerly 1022b3a677 [formerly 92f11c79c1] [formerly 132ac21917] [formerly 132ac21917 [formerly e0525f7816]] [formerly 3686a36ae7 [formerly 132ac21917 [formerly e0525f7816] [formerly 3686a36ae7 [formerly 89acb99f0639f34e4ba3530e49c81ce5dda42785]]]]]
Former-commit-id: 3686a36ae7
Former-commit-id: d22a5f4a2a [formerly bf0c744699] [formerly bf66116b50] [formerly af362b71e4ad7a7dc266d621a890d498c2ba2cc8 [formerly a54e6fce82494d16799fb7d7e0b2263a4942e965] [formerly bf66116b50 [formerly 66e3669532]]]
Former-commit-id: b143e13ed32d52de215aa934b7348e37745ae880 [formerly a5ea213f8d74189bc56129574e7cc290f7e60b8f] [formerly bcb7dbce05 [formerly 40087c34e4]]
Former-commit-id: bcb7dbce05
Former-commit-id: e98fca85c7
 2014-11-13 10:59:00 -06:00
David Lovely
d97047e8c8 Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30. 
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470

Former-commit-id: c8d020fa6f [formerly dca2a23b04] [formerly b32d54c7f9] [formerly b32d54c7f9 [formerly 625e83c445]] [formerly c8d020fa6f [formerly dca2a23b04] [formerly b32d54c7f9] [formerly b32d54c7f9 [formerly 625e83c445]] [formerly 1a191cac55 [formerly b32d54c7f9 [formerly 625e83c445] [formerly 1a191cac55 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]]]]
Former-commit-id: 1a191cac55
Former-commit-id: c26079c8fa [formerly 7c2eea2dd1] [formerly 3b7d20e623] [formerly 5b62e51921a3004da1cb5000c8ea978983219f84 [formerly cedbebb180b50bca15b89397222ee077a0fe89d0] [formerly 3b7d20e623 [formerly b9451471ac]]]
Former-commit-id: 79841ab3ba0627cf198a21e3f962a6dc3e580328 [formerly 01568b110423cde499e076cbfd07238836c16bc0] [formerly 0b76e0a9b6 [formerly 1b3334a183]]
Former-commit-id: 531aca9751af4e961663fc28b95e2b8c453af862 [formerly 0b76e0a9b6]
Former-commit-id: 1401310851
 2014-11-10 08:27:28 -06:00
Steve Harris
eddea6e309 Merge tag 'OB_14.3.1-31m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: 968950b551 [formerly aca1f23f98] [formerly 472d9bd206] [formerly 472d9bd206 [formerly a5398d8035]] [formerly 968950b551 [formerly aca1f23f98] [formerly 472d9bd206] [formerly 472d9bd206 [formerly a5398d8035]] [formerly e770670ebf [formerly 472d9bd206 [formerly a5398d8035] [formerly e770670ebf [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]]]]]
Former-commit-id: e770670ebf
Former-commit-id: 5d7ea54903 [formerly 656299af9f] [formerly e42a5d296f] [formerly 26a6ac4a89f8648066f6b64cad18e6bf8113b31a [formerly 7d1363970cdca069a342dab040a10da42868bb16] [formerly e42a5d296f [formerly 42db241877]]]
Former-commit-id: 94365748a7b5a3db8521eafdfa98822fd43cabe2 [formerly 525a9c1f06f3c03a307699b4295d9e57e237bbd6] [formerly ada6d69ce0 [formerly c4b8243a6e]]
Former-commit-id: ada6d69ce0
Former-commit-id: a2aea9d68a
 2014-11-04 13:17:44 -06:00
mjames-upc
afef573344 build version update 
Former-commit-id: cc027b9974
 2014-10-30 14:48:43 -06:00
Shawn.Hooper
3820ef6b24 ASM #16805 - Increment release number in the awips2-tools rpm spec file 
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: 3f9f787332 [formerly 31c1d24165] [formerly c715bdd83a] [formerly c715bdd83a [formerly 285e4baaec]] [formerly 3f9f787332 [formerly 31c1d24165] [formerly c715bdd83a] [formerly c715bdd83a [formerly 285e4baaec]] [formerly 9332029a6d [formerly c715bdd83a [formerly 285e4baaec] [formerly 9332029a6d [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]]]]
Former-commit-id: 9332029a6d
Former-commit-id: 74c0ded2ce [formerly 19238b4078] [formerly 01ba6f2df0] [formerly 363feca9f68d25af41db64bc9513db70a989d2df [formerly 0288bced58afb5bd1fe2fa083727a6ec5abd6139] [formerly 01ba6f2df0 [formerly 0b0b922968]]]
Former-commit-id: e9a9bc4119a9add9ae256d11dd5fef7c4112b501 [formerly 4a60e0a5206b9f29a194cf60232326289f5a4ec4] [formerly bd561efdaa [formerly 017fd9461d]]
Former-commit-id: bd561efdaa
Former-commit-id: 249b05d610
 2014-10-30 09:58:02 -04:00
mjames-upc
0ca315be49 build scripts updates 
Former-commit-id: a9e2247af9
 2014-10-28 19:51:00 -06:00
mjames-upc
919eb8f0d1 etc/profile.d script updates 
Former-commit-id: aa1b14b338
 2014-10-28 19:50:07 -06:00
Steve Harris
cc0eee6fec Merge tag 'OB_14.3.1-28m' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	rpms/awips2.core/Installer.gfe.climo/component.spec

Former-commit-id: 40591469a4 [formerly bf83d93e3f] [formerly 40225d128a] [formerly 40225d128a [formerly 1b83d045ea]] [formerly 40591469a4 [formerly bf83d93e3f] [formerly 40225d128a] [formerly 40225d128a [formerly 1b83d045ea]] [formerly 19527f50bb [formerly 40225d128a [formerly 1b83d045ea] [formerly 19527f50bb [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]]]]]
Former-commit-id: 19527f50bb
Former-commit-id: d5328dde8a [formerly 210224a441] [formerly 8db5f15d53] [formerly 7c3f1b6815436be6b12c13bf9dd4dcabe1c1746b [formerly 74f06c8118b91a36ff764543245780724877dfce] [formerly 8db5f15d53 [formerly bd4b324ebe]]]
Former-commit-id: 0671daae48d3fdfcd0d748cf9b43bcd4576f10f0 [formerly ccc865fc9b47d08ae4a5a12fb9b56ce09b645ecf] [formerly 74c0a4bc61 [formerly f3e7b20ac7]]
Former-commit-id: 74c0a4bc61
Former-commit-id: fe901cfcb1
 2014-10-28 13:32:31 -05:00
David Lovely
358e695445 Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created. 
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc

Former-commit-id: 0cdf101e9d [formerly 58c9e93aba] [formerly 3d1fa8e1b8] [formerly 3d1fa8e1b8 [formerly 2f9c1e8303]] [formerly 0cdf101e9d [formerly 58c9e93aba] [formerly 3d1fa8e1b8] [formerly 3d1fa8e1b8 [formerly 2f9c1e8303]] [formerly 081ea4a12a [formerly 3d1fa8e1b8 [formerly 2f9c1e8303] [formerly 081ea4a12a [formerly b50c56c84968f4765245ec12fa33c3037b0380ff]]]]]
Former-commit-id: 081ea4a12a
Former-commit-id: d44d5e97b2 [formerly bc6abe72cc] [formerly 28639c96c0] [formerly fced010f27ff1d946501567c3356c9d2cd694f54 [formerly b68ae40acd3573661dd51d2bc668630763f62d58] [formerly 28639c96c0 [formerly 2f02a475a8]]]
Former-commit-id: b55f9884ccf65480b04c7a582f17725ecacc9941 [formerly 291b53f372501c49cf6330c7a312e81747e764b0] [formerly 396eb2cda5 [formerly ab038bc4c7]]
Former-commit-id: 396eb2cda5
Former-commit-id: 93303325e9
 2014-10-23 15:55:26 -05:00
Shawn.Hooper
850368f0de ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf 
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: 7521d6b02f [formerly 0a737d7605] [formerly 114ff128ed] [formerly 114ff128ed [formerly 0e372cd13e]] [formerly 7521d6b02f [formerly 0a737d7605] [formerly 114ff128ed] [formerly 114ff128ed [formerly 0e372cd13e]] [formerly 3b4b9d262a [formerly 114ff128ed [formerly 0e372cd13e] [formerly 3b4b9d262a [formerly e29cf5a57591e5a25b6e73b267c0abb46e9f95c2]]]]]
Former-commit-id: 3b4b9d262a
Former-commit-id: 288a52fb88 [formerly 6553dd930b] [formerly b1426303fa] [formerly 0957096b302aadbc4b80e9599681f36f31dea3a1 [formerly 316973a00d42544ed358ceb26bd0c4fc73613a5c] [formerly b1426303fa [formerly d62f27cae6]]]
Former-commit-id: ded0c442235b13676a7d2afa70bc45c87330618f [formerly a4fec6b5cd213bd8e5b65d1b564284ccaae6678c] [formerly ed790d1a7a [formerly cc74b6bb2c]]
Former-commit-id: ed790d1a7a
Former-commit-id: 08513a31e5
 2014-10-22 14:47:42 -04:00
Steve Harris
c19ef4223a Merge tag 'OB_14.3.1-27m' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: f95adbb8bc [formerly f5b5d2bca2] [formerly e9c9a17f96] [formerly e9c9a17f96 [formerly dc557b2d0c]] [formerly f95adbb8bc [formerly f5b5d2bca2] [formerly e9c9a17f96] [formerly e9c9a17f96 [formerly dc557b2d0c]] [formerly bfade7674d [formerly e9c9a17f96 [formerly dc557b2d0c] [formerly bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]]]
Former-commit-id: bfade7674d
Former-commit-id: 9953d1a83a [formerly 10e766d644] [formerly 879b0608ed] [formerly 9a73d0b6ff5f65193f4990ece573657351c85382 [formerly c910f3c64c7d7ef6791f3502b2d2ed5eb7f82d29] [formerly 879b0608ed [formerly 9e7ce04543]]]
Former-commit-id: 798059a522420cd55ee1ab38c99c2ff1cb8367c6 [formerly ba2773ec94554e459f05101098727f2b8b98e671] [formerly 116b83101e [formerly 040e641ec9]]
Former-commit-id: 116b83101e
Former-commit-id: a087a820cf
 2014-10-22 11:45:39 -05:00
Shawn.Hooper
fa66935e81 ASM #16805 - Fix rpms/legal/ directory 
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

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

Former-commit-id: 944d0407b9 [formerly 3357578661] [formerly 217f39ee04] [formerly 217f39ee04 [formerly e24cb3c37e]] [formerly 944d0407b9 [formerly 3357578661] [formerly 217f39ee04] [formerly 217f39ee04 [formerly e24cb3c37e]] [formerly 65065f2380 [formerly 217f39ee04 [formerly e24cb3c37e] [formerly 65065f2380 [formerly f72ec046e98bdb6734dbce10ef472dd5294c59ba]]]]]
Former-commit-id: 65065f2380
Former-commit-id: 3d0855c070 [formerly 6d8a43b18b] [formerly c491bf611e] [formerly 33ce0c71bcfd0f0752c57f0af0423c39cbbf0ff1 [formerly e0e56fce59d72735378c58f1a382174e1a922e1b] [formerly c491bf611e [formerly e50becc648]]]
Former-commit-id: 74acc71f9992431c648eb5de90f11199d36ddcc2 [formerly 64c59f9d5eb478aa65cc5785f61b776f44dc9aa9] [formerly 82afe46187 [formerly 17f88aad75]]
Former-commit-id: 4083058761e6b3725983fc0125e323d9cad4059a [formerly 82afe46187]
Former-commit-id: 4e478bcbb2
 2014-10-20 14:36:31 -04:00
mjames-upc
534a084919 build increment for python and postgres 
Former-commit-id: e3d26435d4
 2014-10-16 17:00:56 -06:00
Brian.Dyke
9957063d46 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: e3e8946e6c [formerly 4cfcb51852] [formerly 498abd3716] [formerly 498abd3716 [formerly 418894a17b]] [formerly e3e8946e6c [formerly 4cfcb51852] [formerly 498abd3716] [formerly 498abd3716 [formerly 418894a17b]] [formerly 93df82ac92 [formerly 498abd3716 [formerly 418894a17b] [formerly 93df82ac92 [formerly f0f79fb324665245ef759947d24514a6c8bc4470]]]]]
Former-commit-id: 93df82ac92
Former-commit-id: cf7a6e1874 [formerly 471e3f6a7b] [formerly bde528063d] [formerly 97810d7739a9ad204c0751e1e0fb43c6963856db [formerly c21ff59cdf15c4c916761f275e34b868583f6dfa] [formerly bde528063d [formerly 8af5c9870e]]]
Former-commit-id: 37265ac8c77b603a848f805faa0b545e4dceb392 [formerly 9d615abd9636830c9512e42d79d255eeba72db41] [formerly 70568c04be [formerly a71dcd88c4]]
Former-commit-id: e6b7d70838d916bdae8362749535a8daf23e3fb7 [formerly 70568c04be]
Former-commit-id: 1e0d10a21c
 2014-10-16 12:04:27 -04:00
Sean.Webb
31cf1cce12 ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log 
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd

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

Former-commit-id: af867a24f4 [formerly 3b5fd4499b] [formerly ee4cdc015f] [formerly ee4cdc015f [formerly f516cc441d]] [formerly af867a24f4 [formerly 3b5fd4499b] [formerly ee4cdc015f] [formerly ee4cdc015f [formerly f516cc441d]] [formerly 927b2dea69 [formerly ee4cdc015f [formerly f516cc441d] [formerly 927b2dea69 [formerly 721938a9fd9a270a2b886eb19de6df70fd62555d]]]]]
Former-commit-id: 927b2dea69
Former-commit-id: 67bfac9a28 [formerly 7fc3016143] [formerly 99974b81bc] [formerly b17e95ee3b0c64faf11f08625e674d2c6a203863 [formerly d07596f046cf735ce306ef4b687390b676f3c29a] [formerly 99974b81bc [formerly ad412ebf94]]]
Former-commit-id: 81a3e81552054300ec43eea2aab219c7ebbdf106 [formerly f90fd76c0460ad6b8214c502e3081b369ebb0e81] [formerly bda3a5fb4e [formerly 9d73c2b3ea]]
Former-commit-id: bda3a5fb4e
Former-commit-id: 88c0382d8a
 2014-10-15 18:41:58 +00:00
mjames-upc
7eeb299578 pull and merge for HRRR re-edits 
Former-commit-id: 0116938d64
 2014-10-09 16:14:37 -06:00
mjames-upc
a6186ba2eb alertviz autostart removed 
Former-commit-id: d2548859c0
 2014-10-09 16:12:10 -06:00
mjames-upc
455a0dfe52 removed awips2-alertviz.desktop from autostart. manual starting via CAVE client only. 
Former-commit-id: d91a058038
 2014-10-07 11:33:42 -06:00
Steve Harris
7a740e3f84 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: fe9e274e09 [formerly fa1fa76dd9] [formerly f4b771ea72] [formerly f4b771ea72 [formerly da463c484e]] [formerly fe9e274e09 [formerly fa1fa76dd9] [formerly f4b771ea72] [formerly f4b771ea72 [formerly da463c484e]] [formerly 2616fe04b6 [formerly f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 641662f39e [formerly 1c1e618183] [formerly 306826aed9] [formerly 40b67d59271cbd32cf7fdbe3aab8ebaa9c8fee28 [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779] [formerly 306826aed9 [formerly 523cedbb56]]]
Former-commit-id: c8c955bbdac9ab07279978c8aa339cb362a09801 [formerly 85a2c5f56cad1fa8121856b8cb5312cdf481051b] [formerly e05d31ae36 [formerly 57f5294f08]]
Former-commit-id: e05d31ae36
Former-commit-id: e40f190f9a
 2014-10-03 10:18:34 -05:00
Ron Anderson
595720abb3 Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm 
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8

Former-commit-id: 77f537d3b1 [formerly f97651285a] [formerly 35657166ea] [formerly 35657166ea [formerly ec1530c5e8]] [formerly 77f537d3b1 [formerly f97651285a] [formerly 35657166ea] [formerly 35657166ea [formerly ec1530c5e8]] [formerly f44ac32b1e [formerly 35657166ea [formerly ec1530c5e8] [formerly f44ac32b1e [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]]]]]
Former-commit-id: f44ac32b1e
Former-commit-id: de6aaebf88 [formerly 88aae9d195] [formerly 841e270b6f] [formerly cb4481a7cb1eac6038b0d74e45d50038380ad6a8 [formerly 8544b7d76afb53dadb3f5d65587b33d13b6e8ede] [formerly 841e270b6f [formerly b59e41705c]]]
Former-commit-id: df94dcda81a901107c30f2159f0ab439e0e9de0b [formerly a736762ec6fda2c02a849ad08fec20a2cb13b150] [formerly 2d64e79be9 [formerly 50acd7dc68]]
Former-commit-id: 2d64e79be9
Former-commit-id: 92071a03c6
 2014-09-30 14:09:31 -05:00
dmsys
5517dee8b7 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: c7895c80f6 [formerly 70cb8d81b0] [formerly f704781f4f] [formerly f704781f4f [formerly 8c3625cfec]] [formerly c7895c80f6 [formerly 70cb8d81b0] [formerly f704781f4f] [formerly f704781f4f [formerly 8c3625cfec]] [formerly 9f4560c480 [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 09d728ce5b [formerly 0cb584f44e] [formerly 07f84c6b26] [formerly e092800b2477857f3c562704ece4c265d21245bf [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4] [formerly 07f84c6b26 [formerly b884e5e32d]]]
Former-commit-id: 8c0613f5dceff794a5ae9e2d28f5280fa4f7d687 [formerly 8f7a656cd223aa4bbbad7217939da98d6e8672ab] [formerly 71d6e48473 [formerly e00ea2d8cd]]
Former-commit-id: 71d6e48473
Former-commit-id: 6b2eccce36
 2014-09-30 13:45:54 -04:00