Nate Jensen
63189329a1
Omaha #3952 remove custom gzip handling since it is by default enabled
...
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: 4f67ebeb092d182ec0a4e5078e668313d8cc6a57
2015-01-26 09:10:36 -06:00
steve.naples
6488242165
ASM #17051 MPE: Daily QC will not display Points+Grids together.
...
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a
Former-commit-id: 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3
2015-01-23 20:40:48 +00:00
Nate Jensen
415e2d4035
Omaha #3952 disable cairo in alertviz for safety
...
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: 640cf4816e4c0cdd0e39b374b8ed02669e8170be
2015-01-23 12:57:24 -06:00
Steve Harris
158fa16376
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
...
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79
2015-01-23 09:08:06 -06:00
Ana Rivera
705f02f2be
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 653472d785f4af6fef8f2edd93c2e538806096ab
2015-01-23 14:21:22 +00:00
Richard Peter
cc69519ce9
Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1
...
Former-commit-id: 7591f6aa787a52c4fd2d6f9cb9917a1c62380fb5
2015-01-22 19:13:09 -06:00
Mark Peters
db69f5a0bc
Omaha #3768 Add localization to build.properties
...
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: a6cafa7a07d33376cda3cc3a69437e45b6e0330f
2015-01-22 18:05:40 -06:00
Daniel.Huffman
845998cbfa
ASM #17057 RadarDecoder::AlertMessageSanityCheck
...
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: 498f55c757f20f70b11a921a2e5948c3c7c49c90
2015-01-22 21:13:04 +00:00
Shawn.Hooper
314a8497f8
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 60d478ab66ac20c8434b9eb9e4d9f029390f0ba6
2015-01-22 16:05:52 -05:00
Shawn.Hooper
0bc501bd4c
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: d53c809149da23fcae51138cc45c57aecd641794
2015-01-22 16:05:41 -05:00
Dave Hladky
c1127b066f
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: 5aa305adb5fd16c72ce557309cab28fd287379d9
2015-01-22 13:22:18 -06:00
Ana Rivera
7b47ffe362
VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
...
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f
Former-commit-id: 8a66266d3ffa236343f14089d7e7b32c1060f9ea
2015-01-22 16:11:44 +00:00
Shawn.Hooper
bd5dfed072
ASM #17054 - Disable MRMS Menu in 14.3.1
...
Change-Id: I071606c7c14ed0332b3c714a67cebab29bfc67f0
Former-commit-id: 7f6638dd595b99d6592c58af42f898e0f1b2a02a
2015-01-21 12:44:47 -05:00
Juliya Dynina
64d09c6982
Merge "ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's" into asm_14.3.1
...
Former-commit-id: 61f9feec5bf02baefbef740cc16cbc90688242ad
2015-01-21 09:08:36 -05:00
Qinglu.Lin
94ee166aa1
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
...
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: d4e1fca39f82eb39fc911c091eb579a785a6cef9
2015-01-20 16:20:58 -05:00
Nate Jensen
bfcb36eeac
ensure PGEN appears in thinclient D2D Tools menu
...
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a
2015-01-20 11:52:37 -06:00
Fay.Liang
7c3be2689c
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 3f4dada7ef6880e8f6b07f208aeee8ce407e606c
2015-01-16 09:00:03 -05:00
Michael Gamazaychikov
a0ad2f7136
ASM #17035 - TextWS locks up when running spell checker.
...
Change-Id: I7dd263367723f37e0ff3d368edcaca11d982a6b3
Former-commit-id: 1843d3a64ff42d0533016fd4bb126dd0c86f3f22
2015-01-15 16:18:10 -05:00
Fay.Liang
b5f51ea049
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: f1ca6cef3bba0914aadbd4308511a9a96baaa9e5
2015-01-15 15:01:08 -05:00
Steve Harris
a3bbb0ec69
Merge branch 'master_14.3.1' (14.3.1-42) into omaha_14.3.1
...
Former-commit-id: 089467110734e982ec8c7916a48159828e03e75e
2015-01-15 13:27:21 -06:00
Nate Jensen
16d862700a
Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
...
Former-commit-id: 6557237cd4cea3300292e1612622547c23bdde2c
2015-01-15 13:07:10 -06:00
Evan Polster
f361182baa
VLab Issue #5963 . Ensemble Tool Feature; fixes #5963
...
Change-Id: I9f3c44fd80990b2ec60556d55fabade01eb4512f
Former-commit-id: 28d2f4220fa6ef06f4fd1b729607c14b5d9534ac
2015-01-15 18:52:41 +00:00
David Lovely
1cfc27241f
Omaha #3957 Removed trailing slash in Spec for QPID.
...
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: 5fe598aef48f91e57d8f233872ccd0bab395164e
2015-01-15 08:16:18 -06:00
David Lovely
63c3631559
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac
Former-commit-id: 8107830bf2fa384c3bbe9472801c89a2a43990a3
2015-01-14 14:40:36 -06:00
Nate Jensen
bdb58ec755
Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1
...
Former-commit-id: fa93fe561ae1ad49979ab657b4a537dc7731af8e
2015-01-14 14:05:18 -06:00
Brian Clements
1c2d8e01d0
Omaha #3709 unify collaboration color management
...
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions
Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7
Former-commit-id: c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec
2015-01-14 13:00:25 -06:00
Greg Armendariz
6c7e615de5
Merge "Omaha #3957 Fixed path in Installer.edex-environment for QPID." into omaha_14.4.1
...
Former-commit-id: 7c37c3ef1e9822a988f2f3aff9e884fbe48dce9c
2015-01-14 11:33:29 -06:00
David Lovely
9b9d569062
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9
Former-commit-id: 34faf643b5de3c01713e0129209efb4ccc2c2aa0
2015-01-14 11:28:56 -06:00
Fay.Liang
deb2adb1fc
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: e64a61bb41b43b995a6b6e3b3c468aa0fa3c84ed
2015-01-14 12:01:19 -05:00
Ben Steffensmeier
22f13c9f08
Omaha #3966 Limit the number of flags on wind barbs.
...
Former-commit-id: 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d
2015-01-13 17:21:43 -06:00
Nate Jensen
05307be9d0
Omaha #3993 ensure important dataplugin utility folders are included in
...
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: 9f30c7195d6a62206bae05d6e17df4a8e068255e
2015-01-13 16:47:04 -06:00
Ron Anderson
ce0fa19f7b
Omaha #3997 Create script for sites to use to compare AreaDictionary.py files
...
Change-Id: I0b76c40ffe70d1df9d9379deca4bdc0276a723fd
Former-commit-id: 23b10f94f9ff892fdbff654e6fefbd4b3c914f58
2015-01-13 15:11:42 -06:00
Ron Anderson
690861d350
Omaha #3997 Create delta script to preserve the site's current AreaDictionary.py file
...
Change-Id: Id38826c171ed6d87fd8b677c53df7e2a6b49254c
Former-commit-id: 9da286a579c582db47d63aba83552f5361d819e0
2015-01-13 14:32:50 -06:00
Fay.Liang
13fb781066
ASM #15311 - Merge changes from asm_14.4.1 into master_14.4.1
...
Merge branch 'asm_14.4.1' into master_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
Former-commit-id: 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290
2015-01-13 14:35:30 -05:00
Steve Harris
8cc8138832
Merge branch 'omaha_14.4.1' into omaha_pgen
...
Former-commit-id: f742cb887192183a29f4984d7f95a299cad9867a
2015-01-13 11:18:52 -06:00
Ron Anderson
03c265fc9f
Issue #3990 Remove multiple smartInit restriction added by DR #3146
...
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516
Former-commit-id: c4ba2394228935c7725688c11b91c3de130d586b
2015-01-13 11:03:02 -06:00
Fay.Liang
b7e84f200a
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 1627b2a1d7705ae60f8f18545460d29fed1acf3a
2015-01-13 11:58:33 -05:00
Fay.Liang
ffa13d9264
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: f0ed1b055a21c765e6dec0dde0a066089892dd06
2015-01-13 11:58:25 -05:00
Nathan Jensen
0f8d012034
Merge "VLab Issue #5413 - Changes for PGEN in D2D for mouse click" into omaha_pgen
...
Former-commit-id: 76b63bd71b9c38d5c85906df6be75db0b31fed8c
2015-01-13 16:48:36 +00:00
Fay.Liang
5582b8e999
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 35b63703798294e9c28c6aa1d5884a41c0538e09
2015-01-13 11:41:48 -05:00
Sarah Pontius
4bacb954fe
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I0418ffe2cb01337f8549ea2c8021a8e5b566b563
Former-commit-id: 01f727b4b033f80a206533cbf5404c38d12a6fde
2015-01-13 09:04:28 -07:00
cmadmin
5b796ff2f8
Merge "Omaha #3957 Moved QPID to build repository directory structure." into omaha_14.4.1
...
Former-commit-id: 455b763fd46e6053e272854e89074cdb898d4a6c
2015-01-13 09:14:43 -06:00
Nate Jensen
65a0433605
Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1
...
Former-commit-id: d7cc45aa26f71ad81d82dc1dfa2541e105b4c76c
2015-01-12 13:59:25 -06:00
Fay.Liang
d193ca5eb6
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: f0c6dcb30718baede5c31bcb267d3b4524252ab8
2015-01-12 14:55:55 -05:00
Slav Korolev
9c57dab437
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
...
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
2015-01-12 14:32:31 -05:00
steve.naples
ac7d038488
ASM #16993 - Restored code to DrawPolygonDlg to use Combo box for fields.
...
Change-Id: I736af4ac43de16c3978c462fca22bb147846d81b
Former-commit-id: 3a8aaf4ab99e8ae93dd9f074c5671cc8f3dc5f8d
2015-01-12 19:08:06 +00:00
Fay.Liang
c6bd5d7675
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Ana Rivera
3a08e54bfc
Merge "VLab Issue #4953 Run NWRWAVES script for both TCV and HLS. Don't attempt to send TCV backup files in practice mode." into tcv_14.3.2
...
Former-commit-id: 07634aa73cbb07182302518513a54ded9fd69641
2015-01-12 17:43:07 +00:00
Brian Clements
3d33ce1341
Omaha #3709 reworked custom user color configuration
...
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3
Former-commit-id: 18825c076fe273c9ae2e8040ccea2de0698b2877
2015-01-12 11:06:57 -06:00
Nate Jensen
44f0f7aafc
Merge "Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292" into omaha_14.4.1
...
Former-commit-id: 5fc926b7e735f2c92b16a85a7ba5f663a443ea53
2015-01-12 09:22:30 -06:00