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

129 commits

Author SHA1 Message Date
mjames-upc
e2d9ba9a4c merge unidata_15.1.1 to unidata_16.1.4 
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
 2016-03-25 13:09:32 -05:00
mjames-upc
8930e12dec ufpy->python-awips; no longer building thrift or dynamicserialize RPMs 
Former-commit-id: d0068c97dd
 2016-03-16 18:51:24 -05:00
Shawn.Hooper
06ed6117c1 Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1 
Former-commit-id: 48b3d8dd00136b08c400686303c4df3eadd2b55b
 2015-09-01 16:16:26 -04: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
Fay.Liang
fc4955ec2b 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: 31496dac17 [formerly 602505383d4a1ec8a2cea08f94b7350cabae39b7]
Former-commit-id: 3a354bf7fb
 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
Ana Rivera
6914d33292 VLab Issue #8116 - Modify WCOSS NWPS Run scripts to support a 3rd option; fixes; #8116 
Change-Id: Icafd7505b59dc0bf3673c655ceff93c3fefb5176

Former-commit-id: 153619e7ff [formerly a64386381a2543f3a01e418abc0ec36cc317fbeb]
Former-commit-id: de340cde75
 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
f9d33d9a7d 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: 6cd66bff93 [formerly 857d0d89ae214ccf53713f74ef6778ba80c637fe]
Former-commit-id: c31d3f0910
 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
d4abbbdb37 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: 8b31206de4 [formerly ff79e4fdaf62c76f39b0e1948d33e0b84df77011]
Former-commit-id: 1561ee6439
 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
Fay.Liang
9d752cfc41 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: 7349df3d27 [formerly 9742125df2b54fe54e1e06dba554de21db52f5a0]
Former-commit-id: b0d72bf798
 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
David Gillingham
58f8256708 Omaha #4366: Fix gfecron user id check in runManualNWPS_OutsideAWIPS.sh. 
Change-Id: I1738406430766fa01de31a40f8e66b0633ace74f

Former-commit-id: 9db7098bb2 [formerly 3ee51663579734163b54b4997e8a3cb3e0727025]
Former-commit-id: af9ed691fc
 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
43976af1ba Merge tag 'OB_14.4.1-21' into master_15.1.1 
14.4.1-21


Former-commit-id: 77002144a1 [formerly f13fe9af9cb5278362da4b3c67c5997b8ecedd1a]
Former-commit-id: 7809af88b9
 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
8f8f86f60c 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: 133a603566 [formerly 1d282a64da2998d91040a7c97f2e81beea0a8da4]
Former-commit-id: 3bd4d76143
 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
Fay.Liang
cc7a2e7082 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: f3dcf799d6 [formerly a91ad7ff32c153c34d6982f29cc497812d9f22f7]
Former-commit-id: cf8cd9d051
 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
Ron Anderson
ce7a673f30 Omaha #4300 Client-side changes for multi-site service backup 
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034

Former-commit-id: 8c54ff2f61 [formerly 8daff8d5bb3e1bbf23a559671040cae4a03c9911]
Former-commit-id: dcfd2c2e7c
 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
Steve Harris
31a6aa8107 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: 67b3a77c4f [formerly 41217304fa68101d17e003b2fa6992d0e15b083c]
Former-commit-id: 2fd5ba420f
 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
Shawn.Hooper
206438edb7 ASM #17164 - Update gfesuite build files 
Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4

Former-commit-id: 713e1be2c2 [formerly 446c28f031dd408cea1f79c093d9239e47af0798]
Former-commit-id: 98f47b420c
 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
a9945f1981 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: 0e475cb704 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]
Former-commit-id: 059eb032b1
 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
Fay.Liang
07c0347c3e Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 1ed5d493fa [formerly c91a37257cd2882047e79200f624acc1e0312cba]
Former-commit-id: f00b3d3156
 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
Ana Rivera
2525e00fb2 VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566 
Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5

Former-commit-id: d828b762ec [formerly 2f9dd9b8422b899146f73da0a3d922b32b021152]
Former-commit-id: ccc338d7da
 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
Steve Harris
6b97a1bbe9 Merge tag 'OB_14.4.1-13m' into omaha_15.1.1 
14.4.1-13


Former-commit-id: 78b41638b9 [formerly ea76883b615967a79e8c9d0ee16accebd210ee0b]
Former-commit-id: 266e2af93a
 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
David Gillingham
632a6905a1 Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py. 
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: 8c0a035702 [formerly dfbfd38194c88c70f3e75de06bfc7114c6bd3542]
Former-commit-id: 1e86f4cb13
 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
Shawn.Hooper
0d9e4dd69e ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm 
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28

Former-commit-id: 9c637bda0b [formerly 2c62f45654b0531349fef5e7523c67c94236ce1a]
Former-commit-id: 060a169904
 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
Steve Harris
86c6f76ae2 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: 47234a3757 [formerly 28075dabb4b6421ddaee3af71518f565d9bc7e90]
Former-commit-id: 995d60fb54
 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