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

809 commits

Author SHA1 Message Date
mjames-upc
1327508f9f build 14.2.1-19n2 
Former-commit-id: 943fb05022
 2015-01-10 10:58:48 -07:00
mjames-upc
6055fb6c50 ldm pqact update and fix for setting hostname post-install 
Former-commit-id: b343262a85
 2015-01-10 09:57:04 -07:00
mjames-upc
e29a717f80 moved awips2-edex-shapefiles RPM build to separate script, reduce time to run buildEDEX by 20 minutes 
Former-commit-id: 38b0e2e9dd
 2015-01-08 17:08:33 -07:00
David Lovely
9c401ce4ea Omaha #3957 Moved QPID to build repository directory structure. 
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084

Former-commit-id: 208dd5de01 [formerly 240927c241] [formerly 208dd5de01 [formerly 240927c241] [formerly e56002debf [formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]]]
Former-commit-id: e56002debf
Former-commit-id: 9f09af1c8a [formerly d860af2218]
Former-commit-id: b67b97803c
 2015-01-07 12:03:10 -06:00
mjames-upc
6e59ce3a8f remove chkconfig from edex service manager 
Former-commit-id: 4072c212a7
 2015-01-05 15:22:13 -07:00
mjames-upc
10ffa5cf2c NCP updates: new ncuair levels attribute files, UNIWISC SOUNDER composites grouped w ARCTIC/ANTARCTIC composites, FAROP and NCODA renaming, FAROP aerosol optical depth attribute file added, pqact.conf restore UNIWISC composites 
Former-commit-id: fa945602a6
 2015-01-03 14:03:01 -07:00
mjames-upc
af37bea025 LDM RPM build post install file edits. build version and CAVE IDE max memory increase 
Former-commit-id: e260556e9b
 2015-01-03 13:51:19 -07:00
mjames-upc
48790f42b7 CMC NCP resource definition + HRRR disabled in pqact.conf + fix for hostname defnition in awips2-ldm RPM post install 
Former-commit-id: 11f3354e0a
 2014-12-30 15:58:46 -07:00
mjames-upc
b50e95b077 CMC, FNMOC, NAM-5km, NAM-32km, NAM243 grid support added/updated 
Former-commit-id: 042a601d8a
 2014-12-29 15:32:20 -07:00
Fay.Liang
155d0783d2 Merge branch 'master_14.3.1' into master_14.3.2 
Former-commit-id: 795b472fff [formerly 06061eee19] [formerly 795b472fff [formerly 06061eee19] [formerly 77863309a9 [formerly 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d]]]
Former-commit-id: 77863309a9
Former-commit-id: b4051b9fe8 [formerly 22fc1baada]
Former-commit-id: 7839f80035
 2014-12-22 14:43:32 -05:00
Qinglu.Lin
4caef3c695 ASM #637 - Create a base level map bundle for the WarnGenLoc shape file 
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25

Former-commit-id: 2d4a045e3c [formerly 3b3780fd13] [formerly 2d4a045e3c [formerly 3b3780fd13] [formerly baa96590f1 [formerly 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864]]]
Former-commit-id: baa96590f1
Former-commit-id: f4d78ec480 [formerly cae57983d8]
Former-commit-id: 484799b7f5
 2014-12-17 16:53:31 -05:00
Brian Clements
6794196b7c Issue #3935 prevent warning when using init.d script to stop edex 
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03

Former-commit-id: 06d82c9f4e [formerly d2774cffc2] [formerly 06d82c9f4e [formerly d2774cffc2] [formerly 6ae64007a2 [formerly b1034aa16b3393e6584038ebb80faf2a4e1a831f]]]
Former-commit-id: 6ae64007a2
Former-commit-id: 14a6f678ca [formerly 53f28e0b75]
Former-commit-id: db5e0013a8
 2014-12-17 14:35:16 -06:00
Joshua Watson
8dd62191ae VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238 
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: 0c375981e7 [formerly 3f2f7f2f3a] [formerly 0c375981e7 [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]
Former-commit-id: 5aa4748569
Former-commit-id: 1040be8594 [formerly 094e8048e9]
Former-commit-id: eb68dac32d
 2014-12-17 08:38:27 -05:00
Ana Rivera
40df82b005 Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345. 
Conflicts:
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895

Former-commit-id: 214be0a93b [formerly 043bc3a8b7] [formerly 214be0a93b [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]
Former-commit-id: 1823ed3596
Former-commit-id: ef35771bfa [formerly d2d8127363]
Former-commit-id: f7c0319ee4
 2014-12-16 23:39:02 +00:00
Richard Peter
59e9fe78f2 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 23eafaba3d [formerly 2457d0e6f7] [formerly 23eafaba3d [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 746bbb0885 [formerly f7d8755ba9]
Former-commit-id: bf3ddbb62b
 2014-12-12 10:36:04 -06:00
Joshua Watson
8789ca8e8e VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129 
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: 0c8b629c96 [formerly a8f5bb480b] [formerly 0c8b629c96 [formerly a8f5bb480b] [formerly bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]]
Former-commit-id: bca4b40eed
Former-commit-id: ce1476d78f [formerly 9383635749]
Former-commit-id: 33e4b8bc88
 2014-12-11 11:39:00 -05:00
Bryan Kowal
7279d157bb Omaha #3914 - increment yajsw release 
Former-commit-id: c2e0b33c19 [formerly aad5e554b9] [formerly c2e0b33c19 [formerly aad5e554b9] [formerly 0b65eb314d [formerly 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a]]]
Former-commit-id: 0b65eb314d
Former-commit-id: 544c5e39eb [formerly 9efc72561b]
Former-commit-id: e3bad2212b
 2014-12-10 10:34:26 -06:00
Brian Graham
963b52651e ASM #15662 - Updated spec files to include AWIPS version 
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f

Former-commit-id: aabc38c52c [formerly 99143e0045] [formerly aabc38c52c [formerly 99143e0045] [formerly e1b4c4abe3 [formerly 11741b03db9424aa10086553729303fa23a7366f]]]
Former-commit-id: e1b4c4abe3
Former-commit-id: 29912607c9 [formerly 24ca442651]
Former-commit-id: 10fd784dd7
 2014-12-09 09:25:59 -05:00
Bryan Kowal
3ec292bebb Omaha #3508 - remove references to yajsw in %files 
Former-commit-id: 16a33efd8b [formerly 9e55db1c52] [formerly 16a33efd8b [formerly 9e55db1c52] [formerly 9e77b9635e [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]]
Former-commit-id: 9e77b9635e
Former-commit-id: 5644901634 [formerly 7575599185]
Former-commit-id: cc4ee08244
 2014-12-05 10:04:42 -06:00
Bryan Kowal
258f7a93ca Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 
Former-commit-id: 289689e774 [formerly 19f6551c88] [formerly 289689e774 [formerly 19f6551c88] [formerly 48ec32e595 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]
Former-commit-id: 48ec32e595
Former-commit-id: aba4679eb6 [formerly 9f5297504d]
Former-commit-id: ec8371db52
 2014-12-05 09:20:23 -06:00
Greg Armendariz
f1b203fec9 Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1 
Former-commit-id: f6f50778c7 [formerly 8803a6b658] [formerly f6f50778c7 [formerly 8803a6b658] [formerly 610f38e9ef [formerly 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23]]]
Former-commit-id: 610f38e9ef
Former-commit-id: 1e78bd8898 [formerly f307a34150]
Former-commit-id: 2d6ab26fd8
 2014-12-05 08:57:37 -06:00
Greg Armendariz
c3008b22d6 Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1 
Former-commit-id: 73e48f7b1d [formerly 83ca3b5381] [formerly 73e48f7b1d [formerly 83ca3b5381] [formerly ed42ecc0e8 [formerly f310e13350ba8e64e313d99a7d03d0ef3cdc6aba]]]
Former-commit-id: ed42ecc0e8
Former-commit-id: 1fac1cb693 [formerly 9883443470]
Former-commit-id: c87e692d9c
 2014-12-05 08:57:08 -06:00
Bryan Kowal
8ac5284fff Omaha #3508 - purge non-centralized yajsw distributions 
amend: ensure edex is dependent on yajsw

Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55

Former-commit-id: cf5353e368 [formerly 71cf313666] [formerly cf5353e368 [formerly 71cf313666] [formerly 0894efaaa3 [formerly 9b36754ca610887a17666ceff2a1540b958913b6]]]
Former-commit-id: 0894efaaa3
Former-commit-id: 3c95967633 [formerly ccb7cead64]
Former-commit-id: d55f5e0c63
 2014-12-04 17:33:43 -06:00
Bryan Kowal
40434c2d72 Omaha #3508 - created the yajsw rpm 
Former-commit-id: a89e9d96b9 [formerly 8be5362dbd] [formerly a89e9d96b9 [formerly 8be5362dbd] [formerly 127db6aaee [formerly 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21]]]
Former-commit-id: 127db6aaee
Former-commit-id: aa0f4129c4 [formerly c3bb142d88]
Former-commit-id: 27686d8783
 2014-12-04 16:26:55 -06:00
Shawn.Hooper
a9ee60a81d ASM #16805 - Update component.spec for awips2-java for removal of license.txt file 
Change-Id: I55524734785e63647cba46edb8e15324b794af95

Former-commit-id: 2abdd00f1b [formerly d3f6005946] [formerly 2abdd00f1b [formerly d3f6005946] [formerly e4224cd67b [formerly dc77d48fc9c9e5183b94bc05321ab0061404a4ff]]]
Former-commit-id: e4224cd67b
Former-commit-id: f045c0189d [formerly c24d9b2f90]
Former-commit-id: 5a8cad715b
 2014-12-04 16:48:33 -05:00
Fay.Liang
5f6842175d Merge branch 'master_14.3.1' into master_14.3.2 
Former-commit-id: f327b9dd5a [formerly 83a4987188] [formerly f327b9dd5a [formerly 83a4987188] [formerly 19194e0aa3 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]]
Former-commit-id: 19194e0aa3
Former-commit-id: 3404290a55 [formerly 19d1be03e0]
Former-commit-id: d3c8b8a470
 2014-12-04 13:46:31 -05:00
Greg Armendariz
532891c6b7 Omaha #3216 - update postgres to use geos 3.4.2 
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b

Former-commit-id: 515aa32cc6 [formerly 6dd90bb25a] [formerly 515aa32cc6 [formerly 6dd90bb25a] [formerly 1b1064d541 [formerly 453247c7731adb5e1ca4e58306d14715c0f3a350]]]
Former-commit-id: 1b1064d541
Former-commit-id: fa7fef1605 [formerly aba34ca613]
Former-commit-id: 88cd053b81
 2014-12-04 11:34:45 -06:00
Greg Armendariz
c561bcc4e2 Omaha #3216 - Increment pypies release number 
Former-commit-id: 0650a941b1 [formerly 7ac9281ba6] [formerly 0650a941b1 [formerly 7ac9281ba6] [formerly 44af2c4ff1 [formerly 0497a64f539e716089736597385ff9ff3d18e5c0]]]
Former-commit-id: 44af2c4ff1
Former-commit-id: f76075c3cc [formerly bed2187d35]
Former-commit-id: 2b3b672618
 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
33b903d97e 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: b1bf38f922 [formerly eb52d1b333] [formerly b1bf38f922 [formerly eb52d1b333] [formerly 700eefe0ee [formerly 2dafcfc4e0350654c30eb077329711259bf12d1f]]]
Former-commit-id: 700eefe0ee
Former-commit-id: 4a106ddab1 [formerly d40302bf3b]
Former-commit-id: a05d7f7cc1
 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
d7f86a9a63 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 069db81e14 [formerly 99263f79e1] [formerly 069db81e14 [formerly 99263f79e1] [formerly 5bd22b74c6 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]]
Former-commit-id: 5bd22b74c6
Former-commit-id: acdabae0ab [formerly 7aa08b8ba4]
Former-commit-id: 59f64b29b1
 2014-11-20 13:32:25 -05:00
Shawn Hooper
6699c18a7a VLab Issue #5395 - Build fixes and gfeConfig.py update 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: fd57e5334c [formerly b7369c5eef] [formerly fd57e5334c [formerly b7369c5eef] [formerly cf72b5753d [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]]
Former-commit-id: cf72b5753d
Former-commit-id: 2f954d65be [formerly 330eae9f9e]
Former-commit-id: b6d1f3aef4
 2014-11-20 13:12:16 -05:00
Fay.Liang
5c3a6d006c Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: a32ec39df2 [formerly 29561d5324] [formerly a32ec39df2 [formerly 29561d5324] [formerly 45b80432d6 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]]
Former-commit-id: 45b80432d6
Former-commit-id: a75d5d336d [formerly de4ab82df7]
Former-commit-id: e61707aefc
 2014-11-19 22:07:54 -05:00
Shawn Hooper
da77e0bcd3 VLab Issue #5375 - Update spec file for VADATUMS tar file. 
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13

Former-commit-id: 3455a07e99 [formerly 50cd8ace64] [formerly 3455a07e99 [formerly 50cd8ace64] [formerly f88d320e60 [formerly 83e81ee0af2d612f08f32e760e9f4d00ee1dd7aa]]]
Former-commit-id: f88d320e60
Former-commit-id: a872090b54 [formerly 58fed17369]
Former-commit-id: f543901a53
 2014-11-19 14:08:27 -05:00
Greg Armendariz
a17f0cb3e1 Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build 
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: d3295027c2 [formerly ad5e3134e4] [formerly d3295027c2 [formerly ad5e3134e4] [formerly d7af478037 [formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]]]
Former-commit-id: d7af478037
Former-commit-id: fa3eda0370 [formerly 756d33bf89]
Former-commit-id: 1fbd4f0038
 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
bcb7dbce05 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: 132ac21917 [formerly e0525f7816] [formerly 132ac21917 [formerly e0525f7816] [formerly 3686a36ae7 [formerly 89acb99f0639f34e4ba3530e49c81ce5dda42785]]]
Former-commit-id: 3686a36ae7
Former-commit-id: bf66116b50 [formerly 66e3669532]
Former-commit-id: 40087c34e4
 2014-11-13 10:59:00 -06:00
David Lovely
0b76e0a9b6 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: b32d54c7f9 [formerly 625e83c445] [formerly b32d54c7f9 [formerly 625e83c445] [formerly 1a191cac55 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]]
Former-commit-id: 1a191cac55
Former-commit-id: 3b7d20e623 [formerly b9451471ac]
Former-commit-id: 1b3334a183
 2014-11-10 08:27:28 -06:00
Steve Harris
ada6d69ce0 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: 472d9bd206 [formerly a5398d8035] [formerly 472d9bd206 [formerly a5398d8035] [formerly e770670ebf [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]]]
Former-commit-id: e770670ebf
Former-commit-id: e42a5d296f [formerly 42db241877]
Former-commit-id: c4b8243a6e
 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
bd561efdaa ASM #16805 - Increment release number in the awips2-tools rpm spec file 
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: c715bdd83a [formerly 285e4baaec] [formerly c715bdd83a [formerly 285e4baaec] [formerly 9332029a6d [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]]
Former-commit-id: 9332029a6d
Former-commit-id: 01ba6f2df0 [formerly 0b0b922968]
Former-commit-id: 017fd9461d
 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
74c0a4bc61 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: 40225d128a [formerly 1b83d045ea] [formerly 40225d128a [formerly 1b83d045ea] [formerly 19527f50bb [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]]]
Former-commit-id: 19527f50bb
Former-commit-id: 8db5f15d53 [formerly bd4b324ebe]
Former-commit-id: f3e7b20ac7
 2014-10-28 13:32:31 -05:00