Fay.Liang
|
0a5f18487a
|
Merge tag 'OB_14.3.3-5' into master_14.4.1
Merges 14.3.3-3, 14.3.3-4, and 14.3.3-5
Former-commit-id: 66eb429aee1d602cf216f1509e780afdbd1cbd23
|
2015-04-10 13:49:22 -04:00 |
|
Fay.Liang
|
a2193b5b4b
|
Merge tag 'OB_14.3.3-5' into master_14.4.1
Merges 14.3.3-3, 14.3.3-4, and 14.3.3-5
Former-commit-id: 88d6e796f5 [formerly 0a5f18487a [formerly 66eb429aee1d602cf216f1509e780afdbd1cbd23]]
Former-commit-id: 0a5f18487a
Former-commit-id: 266161bf86
|
2015-04-10 13:49:22 -04:00 |
|
Fay.Liang
|
a4a2421296
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9
|
2015-04-10 12:13:31 -04:00 |
|
Fay.Liang
|
abe7660994
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 6a9a1daef6 [formerly a4a2421296 [formerly a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9]]
Former-commit-id: a4a2421296
Former-commit-id: 3898abb1db
|
2015-04-10 12:13:31 -04:00 |
|
Steve Harris
|
1d281377d5
|
Omaha #3299 - Master rights and foss for 14.4.1
Former-commit-id: e9c9daec3e77c8f9af54afb06318f0dce9958b50
|
2015-04-09 10:22:32 -05:00 |
|
Steve Harris
|
065c1e8155
|
Omaha #3299 - Master rights and foss for 14.4.1
Former-commit-id: 6aa72398d2 [formerly 1d281377d5 [formerly e9c9daec3e77c8f9af54afb06318f0dce9958b50]]
Former-commit-id: 1d281377d5
Former-commit-id: 42d321d3c8
|
2015-04-09 10:22:32 -05:00 |
|
Sean.Webb
|
d06ab7014d
|
Merge "ASM #17189 - Removed rpm commands from profile scripts" into asm_15.1.1
Former-commit-id: 2ea7877fa70890bb8936c0cbe445478470cfa7de
|
2015-04-08 12:24:19 -05:00 |
|
Fay.Liang
|
b0d72bf798
|
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 |
|
Brian Graham
|
bd4404d946
|
ASM #14516 - changed handling of edexServiceList
Id93c1b51f91ff24b8534f71e6a6773b8a56e345c
Change-Id: I5c0fa4164d53816eb21056b4f7b52d1a8f597e22
Former-commit-id: 7035c00bf1a8b91fafa55620d645a4dce966b325
|
2015-04-08 11:22:20 -04:00 |
|
Fay.Liang
|
c1d84bf3b0
|
Merge branch 'field_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.3
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: fea365e547f12a13a942594f8267b15a7895a102
|
2015-04-07 15:38:18 -04:00 |
|
Fay.Liang
|
ab37a5c8a3
|
Merge branch 'field_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.3
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 2301da818a [formerly c1d84bf3b0 [formerly fea365e547f12a13a942594f8267b15a7895a102]]
Former-commit-id: c1d84bf3b0
Former-commit-id: 43adcc2ea3
|
2015-04-07 15:38:18 -04:00 |
|
Ana Rivera
|
b5150e3d43
|
VLab Issue #7489 - Fix SFPA42 data_store entry in pqact.conf;fixes #7489
Change-Id: Id7675169dc22035ea9640fdf07351f8667638dd6
Former-commit-id: 2b2b0b0387932888eaa6c8e5b86fc05d7254de3a
|
2015-04-07 18:33:14 +00:00 |
|
Ana Rivera
|
5f6d3ed622
|
VLab Issue #7489 - Fix SFPA42 data_store entry in pqact.conf;fixes #7489
Change-Id: Id7675169dc22035ea9640fdf07351f8667638dd6
Former-commit-id: 53807298e8 [formerly b5150e3d43 [formerly 2b2b0b0387932888eaa6c8e5b86fc05d7254de3a]]
Former-commit-id: b5150e3d43
Former-commit-id: f486274e5d
|
2015-04-07 18:33:14 +00:00 |
|
Greg Armendariz
|
0d56041c75
|
Omaha #4103 - Remove svcbu.properties from RPM package list
Former-commit-id: d2af97d5e158148cdaafb2c619b4f393e99d4483
|
2015-04-01 11:12:04 -05:00 |
|
Fay.Liang
|
7809af88b9
|
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
|
3bd4d76143
|
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 |
|
Steve Harris
|
1aab7b1831
|
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
|
2015-03-30 11:07:52 -05:00 |
|
Fay.Liang
|
e7d2d5e901
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: f8b4d9d81247c6089960c83b57417a5ba62cdfc2
|
2015-03-27 15:16:09 -04:00 |
|
Fay.Liang
|
f81dd89c07
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: dd7c47b911 [formerly e7d2d5e901 [formerly f8b4d9d81247c6089960c83b57417a5ba62cdfc2]]
Former-commit-id: e7d2d5e901
Former-commit-id: 8383682425
|
2015-03-27 15:16:09 -04:00 |
|
Fay.Liang
|
cf8cd9d051
|
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
|
6f334984cb
|
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 cf8cd9d051 [formerly a91ad7ff32c153c34d6982f29cc497812d9f22f7]]
Former-commit-id: cf8cd9d051
Former-commit-id: cc7a2e7082
|
2015-03-27 15:07:28 -04:00 |
|
Sean.Webb
|
d93c0ec88c
|
Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
Former-commit-id: ec7696a5ca44ccdebf86888d27e3fcb151576a61
|
2015-03-27 08:06:00 -05:00 |
|
Sean.Webb
|
4a54cf9006
|
Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
Former-commit-id: 6679bc9519 [formerly d93c0ec88c [formerly ec7696a5ca44ccdebf86888d27e3fcb151576a61]]
Former-commit-id: d93c0ec88c
Former-commit-id: 0bfb84273c
|
2015-03-27 08:06:00 -05:00 |
|
Sean.Webb
|
022b59e739
|
ASM #17221 - Updated LDM to 6.12.9
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319
Former-commit-id: 3fb2bed462ec0cb2f985b80a4ea02192eac917db
|
2015-03-27 07:58:40 -04:00 |
|
Sean.Webb
|
49f1959c15
|
ASM #17221 - Updated LDM to 6.12.9
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319
Former-commit-id: 723febe25e [formerly 022b59e739 [formerly 3fb2bed462ec0cb2f985b80a4ea02192eac917db]]
Former-commit-id: 022b59e739
Former-commit-id: 35b2495144
|
2015-03-27 07:58:40 -04:00 |
|
Steve Harris
|
25bd3ee930
|
Merge tag 'OB_14.4.1-20m' into omaha_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 (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
|
2015-03-26 09:57:17 -05:00 |
|
Sean.Webb
|
b6153f4058
|
ASM #17189 - Removed rpm commands from profile scripts
Change-Id: Id6abd356376c29a179278a127828e8616cc66fbd
Former-commit-id: 0b51d70c7f71fdecdc2f4ab0988d1d1161019030
|
2015-03-24 14:31:17 -04:00 |
|
Fay.Liang
|
2eb8777058
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
|
2015-03-19 12:35:31 -04:00 |
|
Fay.Liang
|
0284b3b7e9
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
|
2015-03-18 15:12:56 -04:00 |
|
Fay.Liang
|
15560cc42e
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 475019fb61 [formerly 0284b3b7e9 [formerly e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e]]
Former-commit-id: 0284b3b7e9
Former-commit-id: 228e85dcb9
|
2015-03-18 15:12:56 -04:00 |
|
Fay.Liang
|
6f8f2f5398
|
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 42d435f739134ec29a021415ed96b6c3406fc021
|
2015-03-18 14:54:46 -04:00 |
|
Fay.Liang
|
ec294fd11c
|
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 3233640aa2 [formerly 6f8f2f5398 [formerly 42d435f739134ec29a021415ed96b6c3406fc021]]
Former-commit-id: 6f8f2f5398
Former-commit-id: 8db78cb400
|
2015-03-18 14:54:46 -04:00 |
|
Steve Harris
|
2fd5ba420f
|
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 |
|
Sean.Webb
|
ada3710b7e
|
ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS
Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6
Former-commit-id: f3164dc891d77c84d12e745a7ece5bd7eddfa0ee
|
2015-03-17 11:31:56 -04:00 |
|
Sean.Webb
|
3008bd9c75
|
ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS
Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6
Former-commit-id: 506090817b [formerly ada3710b7e [formerly f3164dc891d77c84d12e745a7ece5bd7eddfa0ee]]
Former-commit-id: ada3710b7e
Former-commit-id: 9918c8e476
|
2015-03-17 11:31:56 -04:00 |
|
Melissa Porricel
|
7db813d59c
|
ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c
Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
|
2015-03-16 17:14:56 -04:00 |
|
mjames-upc
|
c640750bdb
|
psql profile.d script account control
Former-commit-id: 8f335571ec [formerly 08d6e0eaf0] [formerly cd51f7b6bec42961cfe384381683ae382919f490 [formerly c155facc96]]
Former-commit-id: c161edfd9351998303b01f9b2be1671e32a78bb4 [formerly 5c0fe6ed10]
Former-commit-id: 62efd40c74
|
2015-03-13 15:17:13 -06:00 |
|
Fay.Liang
|
29863ea663
|
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: f7d4e763a667aef949d360d18143f8caa618ae6b
|
2015-03-12 22:23:33 -04:00 |
|
Fay.Liang
|
3593db8387
|
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: 8bdfffa97d [formerly 29863ea663 [formerly f7d4e763a667aef949d360d18143f8caa618ae6b]]
Former-commit-id: 29863ea663
Former-commit-id: 0b3baf855f
|
2015-03-12 22:23:33 -04:00 |
|
mjames-upc
|
bb8a378c01
|
upc RPM build using _component_version and _component_release from buildEnvironment.sh
Former-commit-id: 2caad5d9a7 [formerly abc109f421] [formerly c662817804711b07a1c0388eadd7c80440df841a [formerly 73f35ddf96]]
Former-commit-id: 89ea56f8afba7b69bf6fcb5292de120201157009 [formerly 95cacfedd2]
Former-commit-id: 9ea71aef1f
|
2015-03-12 16:02:08 -06:00 |
|
Shawn.Hooper
|
98f47b420c
|
ASM #17164 - Update gfesuite build files
Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4
Former-commit-id: 446c28f031dd408cea1f79c093d9239e47af0798
|
2015-03-12 17:14:33 -04:00 |
|
Shawn.Hooper
|
ab1c4b8ec3
|
ASM #17164 - Update gfesuite build files
Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4
Former-commit-id: 713e1be2c2 [formerly 98f47b420c [formerly 446c28f031dd408cea1f79c093d9239e47af0798]]
Former-commit-id: 98f47b420c
Former-commit-id: 206438edb7
|
2015-03-12 17:14:33 -04:00 |
|
AWIPS User
|
d1b52a2e6d
|
edex service mananger check for wlan and eth interfaces
Former-commit-id: 1be6f1d726 [formerly 06c82e1e94] [formerly 76a1fcee39e61bc557e7b8a348b5e376ec9b4cec [formerly cc7e4035e7]]
Former-commit-id: 8fe332d7b5060b1a85aa6b51aed24ccb933a7bed [formerly 74d3d0d8b1]
Former-commit-id: 16e3a6b7e8
|
2015-03-12 15:00:13 -06:00 |
|
AWIPS User
|
36e7af29a0
|
pqact.conf formatting pt 2
Former-commit-id: 8168c3a104 [formerly 7e5f4a72bb] [formerly b441bee49b54a798617b0ae46648500f6f01b6d2 [formerly 869e4f6a24]]
Former-commit-id: 78371d6e42249603a00ac6904d983f0c1df97028 [formerly df5362d727]
Former-commit-id: bbd3b86ca5
|
2015-03-11 17:12:12 -06:00 |
|
AWIPS User
|
93b83b735d
|
pqact.conf formatting
Former-commit-id: 67abc9fd43 [formerly 7d124a1bb5] [formerly 57ace7e0fad542bc713652c7c64238ead71db586 [formerly 1a3f4c8700]]
Former-commit-id: 3d78a986de1d119fe30ff2681447c85334465b26 [formerly 421ee53eeb]
Former-commit-id: e694569ad0
|
2015-03-11 17:11:17 -06:00 |
|
Fay.Liang
|
8b2164cfa1
|
Merge tag 'OB_14.3.2-21m' into master_14.4.1
14.3.2-21m
Former-commit-id: f08ea9cd7acadd1f8f1bb2eedf7ce39894c3f39e
|
2015-03-11 14:32:22 -04:00 |
|
Fay.Liang
|
2d47e9b612
|
Merge tag 'OB_14.3.2-21m' into master_14.4.1
14.3.2-21m
Former-commit-id: 70714494f9 [formerly 8b2164cfa1 [formerly f08ea9cd7acadd1f8f1bb2eedf7ce39894c3f39e]]
Former-commit-id: 8b2164cfa1
Former-commit-id: 17934b3a66
|
2015-03-11 14:32:22 -04:00 |
|
mjames-upc
|
f3f5997d8f
|
ldm pqact.conf GFS updates for new CONDUIT naming
Former-commit-id: 5f4b0905e1 [formerly 601ea2e80e] [formerly 5f7a39ee23234bfc790de7a00f9fd99867dd94bc [formerly 2c9091872c]]
Former-commit-id: 26d39efcf6b3ae391e4c0f5eea7d876f131e3663 [formerly 1b32cbd9ea]
Former-commit-id: 02b27e42d2
|
2015-03-10 16:39:12 -06:00 |
|
Fay.Liang
|
4be968c00b
|
Merge branch 'master_14.3.1.1' into master_14.3.2
Former-commit-id: 450fdfceca0e7f3745a8dcbffe3d7740ff1aee64
|
2015-03-10 14:52:49 -04:00 |
|
Fay.Liang
|
67497cc1e9
|
Merge branch 'master_14.3.1.1' into master_14.3.2
Former-commit-id: d06537cf12 [formerly 4be968c00b [formerly 450fdfceca0e7f3745a8dcbffe3d7740ff1aee64]]
Former-commit-id: 4be968c00b
Former-commit-id: 5b9a4ddbdf
|
2015-03-10 14:52:49 -04:00 |
|