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

76 commits

Author SHA1 Message Date
Ying-Lian.Shi
a9297cf139 ASM #19158 GFE: make_hti.sh scriptneeds to create a specific file IDG requires in order to generate the mosaics of each element 
Change-Id: If46faa776521859c839b9696cf28a46054447bbc
 2016-08-30 13:02:13 -05:00
mjames-upc
51d96088e2 ufpy->awips 
Former-commit-id: 7cf8ba6f023a28b31012f523863fc374d91842ac
 2016-06-27 17:02:26 -05:00
Steve Harris
4ba488bd0a Merge branch 'omaha_16.2.1' into omaha_16.2.2 
Former-commit-id: 27f7e431d04f99ec48723c71413e9633c0d1996e
 2016-02-15 10:15:20 -06:00
Steve Harris
85055fcc53 Merge branch 'omaha_16.2.1' into omaha_16.2.2 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
	cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
 2016-02-01 11:57:52 -06:00
Sean.Webb
ea30ff3359 ASM #18568 - Removed unused deploy.nwps.client target 
Change-Id: Ib965776338896ad1216c4db6eba5b1e48a96b27f

Former-commit-id: 311adf936085baa38ed0e2de0449fd4e42119f9b
 2016-01-28 10:35:24 -05:00
Sean.Webb
6c64a64cd9 ASM #18568 - Fixed permissions on nwps directory and removed hti and nwps dir from client rpm 
Change-Id: I28c96ee951f5ebe821bb621db81d0f70bcf6bdb3

Former-commit-id: d2b32176bfb06e66d515fb6b04f761a17d2444b9
 2016-01-27 12:45:16 -05:00
David Gillingham
7ed24b1466 Omaha #5129: Create common IFPClient project, modify all GFE viz code to utilize it. 
Change-Id: Idca516558b7b256197cf68b2db179bbfc74e440c

Former-commit-id: 8b9aeee624072d573c2b15d08d5e1572a51c9ed0
 2015-12-09 14:50:34 -06:00
Ana Rivera
bc0a126063 VLab Issue #8168 - DR17495 Configure LDMSERVER values for Run NWPS script in an environment file; fixes #8168 
* smartinit/nwpsCG1.py & nwpsTrkngCG0.py - eliminates multiple banners
* gfesuite/nwps/bin/runManualNWPS_OutsideAWIPS.sh - install on px2f
* gfesuite/nwps/etc/sitevars.ccc - install on px2f
* procedures/Run_NWPS.py
* gfesuite/nwps/* - chmod for directories and subdirectories
*    to 775. chown to awips:fxalpha

Change-Id: I5938b66c2ae7d92642bf9e4022737569585e6bea

Former-commit-id: 4c08765fc72325e818dacc6394ee53719edac6db
 2015-12-04 14:35:14 +00:00
Steve Harris
4bb1dfd213 Merge tag 'OB_16.1.1-9' into omaha_16.2.1 
16.1.1-9

 Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java


Former-commit-id: 4ff4f4722a0fd37cf6ec75c701acd43d778ce7c2
 2015-09-01 16:06:40 -05:00
Ron Anderson
cee3eef805 Omaha #4812 Fixed sendGridsToNDFD 
Change-Id: I1df29706f60b4d15fb2ab58ba8f7dfd40e77e248

Former-commit-id: 43c26891790f85a67aba894a0428fa8239b0d972
 2015-08-27 14:30:12 -05:00
Shawn.Hooper
5759470634 Merge tag 'OB_15.1.1-32' into master_16.1.1 
15.1.1-32

Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
	edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java

Former-commit-id: f925ff11b783389e5ca32a2d7cd1ec5edfa835db
 2015-08-19 14:58:31 -04:00
Ron Anderson
1c4d5a5a9d Omaha #4013 Allow rsyncGridsToCWF_client.sh to use entire EDEX cluster 
Change-Id: I98a849bbd96a35ac8f3e418c3410dac5839e77b4

Former-commit-id: 7276286f419d5baba1efb2374eec2f3b903973d9
 2015-07-21 12:42:01 -05:00
Ron Anderson
cf2b978592 Omaha #4573 Add exception handling for deserialization errors 
Change-Id: I62ca0eec08f5a64e4ef321cb5552a3074bd5446f

Former-commit-id: 7d425f9bffd3977087754a0e09edd97e9060135c
 2015-06-25 13:35:10 -05:00
Ron Anderson
7f29a37243 Omaha #4573 Fix getNotify.py to work better with output redirection 
Change-Id: Iecfa7afaf778aceaebcd7720bf10b4c59db95ff6

Former-commit-id: 150caf20967996f84667a287188ce93449d6d22b
 2015-06-25 12:33:26 -05:00
Ron Anderson
0c8b7a482e Omaha #4573 Fix getNotify.py 
Change-Id: I145a48a1be27713b1635b2d588eb505d3788b003

Former-commit-id: b4e8d4e0c24b30b0166e36fdb089a6c4e1c32cd5
 2015-06-25 10:27:31 -05:00
Steve Harris
4de63454fc Merge tag 'OB_15.1.1-16' into omaha_16.1.1 
15.1.1-16

 Conflicts:
	cave/com.raytheon.viz.gfe/build.properties
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py


Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
 2015-06-05 15:38:00 -05:00
Fay.Liang
31496dac17 Merge tag 'OB_14.4.1-47' into int_15.1.1 
14.4.1-47

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
 2015-05-29 15:42:40 -04:00
David Gillingham
98163ae9b8 Omaha #4427: Support GFE subdomains for service backup. 
Change-Id: I4f4cd575665f7326b8bac7a284d2a954cb392750

Former-commit-id: c8734223a8389e34b2cef191c15dee59622231cd
 2015-05-14 11:27:46 -05:00
Ana Rivera
153619e7ff VLab Issue #8116 - Modify WCOSS NWPS Run scripts to support a 3rd option; fixes; #8116 
Change-Id: Icafd7505b59dc0bf3673c655ceff93c3fefb5176

Former-commit-id: a64386381a2543f3a01e418abc0ec36cc317fbeb
 2015-05-11 18:07:25 +00:00
Fay.Liang
6cd66bff93 Merge tag 'OB_14.4.1-25' into master_15.1.1 
This merge includes all changes in 14.4.1-22, -23, -24, and -25

Conflicts:
	cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt

Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
 2015-04-13 13:02:24 -04:00
Fay.Liang
8b31206de4 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: ff79e4fdaf62c76f39b0e1948d33e0b84df77011
 2015-04-09 10:18:40 -04:00
Fay.Liang
7349df3d27 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config

Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
 2015-04-08 12:22:27 -04:00
David Gillingham
9db7098bb2 Omaha #4366: Fix gfecron user id check in runManualNWPS_OutsideAWIPS.sh. 
Change-Id: I1738406430766fa01de31a40f8e66b0633ace74f

Former-commit-id: 3ee51663579734163b54b4997e8a3cb3e0727025
 2015-04-03 12:06:00 -05:00
Fay.Liang
77002144a1 Merge tag 'OB_14.4.1-21' into master_15.1.1 
14.4.1-21


Former-commit-id: f13fe9af9cb5278362da4b3c67c5997b8ecedd1a
 2015-04-01 10:27:48 -04:00
Fay.Liang
133a603566 Merge tag 'OB_14.4.1-20m' into master_15.1.1 
14.4.1-20m

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
 2015-03-30 14:28:30 -04:00
Fay.Liang
f3dcf799d6 Merge tag 'OB_14.3.2-24m' into master_14.4.1 
14.3.2-24m

Conflicts:
	rpms/awips2.core/Installer.gfesuite-server/component.spec

Former-commit-id: a91ad7ff32c153c34d6982f29cc497812d9f22f7
 2015-03-27 15:07:28 -04:00
Ron Anderson
8c54ff2f61 Omaha #4300 Client-side changes for multi-site service backup 
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034

Former-commit-id: 8daff8d5bb3e1bbf23a559671040cae4a03c9911
 2015-03-23 16:08:31 -05:00
Steve Harris
67b3a77c4f Merge tag 'OB_14.4.1-18m' into omaha_15.1.1 
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
 2015-03-18 09:29:01 -05:00
Shawn.Hooper
713e1be2c2 ASM #17164 - Update gfesuite build files 
Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4

Former-commit-id: 446c28f031dd408cea1f79c093d9239e47af0798
 2015-03-12 17:14:33 -04:00
Fay.Liang
0e475cb704 Merge tag 'OB_14.3.2-19m' into master_14.4.1 
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.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/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
 2015-03-09 16:11:13 -04:00
Fay.Liang
1ed5d493fa Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: c91a37257cd2882047e79200f624acc1e0312cba
 2015-03-03 14:44:31 -05:00
Ana Rivera
d828b762ec VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566 
Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5

Former-commit-id: 2f9dd9b8422b899146f73da0a3d922b32b021152
 2015-02-23 17:28:29 +00:00
Steve Harris
78b41638b9 Merge tag 'OB_14.4.1-13m' into omaha_15.1.1 
14.4.1-13


Former-commit-id: ea76883b615967a79e8c9d0ee16accebd210ee0b
 2015-02-20 13:17:47 -06:00
David Gillingham
8c0a035702 Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py. 
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: dfbfd38194c88c70f3e75de06bfc7114c6bd3542
 2015-02-18 13:07:56 -06:00
Shawn.Hooper
9c637bda0b ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm 
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28

Former-commit-id: 2c62f45654b0531349fef5e7523c67c94236ce1a
 2015-02-12 17:32:05 -05:00
Steve Harris
47234a3757 Merge tag 'OB_14.4.1-5m' into omaha_15.1.1 
14.4.1-5

Conflicts:
	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

Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
 2015-01-28 13:45:36 -06:00
Ana Rivera
7c25945fd9 Merge branch 'master_14.4.1' into emc_14.4.1 
Conflicts:
	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: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1

Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
 2015-01-26 18:45:26 +00:00
Steve Harris
9234ceb485 Merge tag 'OB_14.4.1-2m' into omaha_15.1.1 
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)

Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
 2015-01-23 09:32:44 -06:00
Ron Anderson
f7b327f1f6 Omaha #4013 Change rsyncGrdsToCWF_client.sh to use any available EDEX cluster member 
Change-Id: If2370cf73ec816bbac2a9b46ebbc8fb720eae805

Former-commit-id: e2f809e7b48f83b5abeb4dcda0c7e96a160e7fbf
 2015-01-20 16:46:47 -06:00
Ana Rivera
77d66167f0 VLab Issue #5704 - Update NWPS: runManualNWPS_OutsideAWIPS.sh; fixes #5704 
Change-Id: I32484682f1eb2bccd286673a1ea15cebd8df9320

Former-commit-id: b016c3bcb587c04b4d0e5d21ecce6f5e6bb3e75d
 2014-12-18 14:13:24 +00:00
Richard Peter
8de1ebcb65 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: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
 2014-12-12 10:36:04 -06:00
Ana Rivera
fe5bfbaa73 VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194 
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f

Former-commit-id: 6866439b0a7075f04146af4b4bdce59477269f4d
 2014-12-02 15:44:07 +00:00
Ana Rivera
5abf37ea62 VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472 
This reverts commit f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1].

Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685

Former-commit-id: 373acfce57d5e0044f13382b926cb2fc1f830e54
 2014-12-02 13:43:03 +00:00
Shawn Hooper
cf72b5753d VLab Issue #5395 - Build fixes and gfeConfig.py update 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: 94093accc4b2adc4c12cea0a3af0e037c1be52d8
 2014-11-20 13:12:16 -05:00
Ana Rivera
af00fd8a98 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382 
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: 7d9cf7bfb3f513314608b6269f437061fc36d090
 2014-11-19 20:29:42 +00:00
Ana Rivera
e54f3305d8 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318 
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42
 2014-11-14 16:58:11 +00:00
Ana Rivera
f1f5f2c717 VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034 
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426

Former-commit-id: a72135fc85a602b67b929b6870edbaabf4dc8fc1
 2014-10-22 17:03:07 +00:00
Ron Anderson
b09244975e Omaha #3623 Created command line utilities to activate/deactivate sites 
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408

Former-commit-id: 670a9bd71874fbd6fecd0c9df5567ad342892333
 2014-09-17 14:35:47 -05:00
John.McPherson
2d8ce4e577 ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup 
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a

Former-commit-id: 4d9b74dc181c359681eda8bae04f7c46f41d5769
 2014-03-04 17:24:00 +00:00
Bryan Kowal
c8d7a32e2e Merge branch 'omaha_14.1.1' into development_on_RHEL6 
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: bb2efa59ed211345e071829f47d41eba232baae9
 2013-10-31 15:34:46 -05:00