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

7800 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ana Rivera
aa04bff454 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: 654d08a588 [formerly 98ac97e397] [formerly 654d08a588 [formerly 98ac97e397] [formerly 7c25945fd9 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]]
Former-commit-id: 7c25945fd9
Former-commit-id: d6630d8f35 [formerly eae1bd317d]
Former-commit-id: cd2841195b
 2015-01-26 18:45:26 +00:00
Shawn.Hooper
a5b70920fd Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: e6c4f29036 [formerly 568b7c801a] [formerly e6c4f29036 [formerly 568b7c801a] [formerly e84a037b2e [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]]
Former-commit-id: e84a037b2e
Former-commit-id: 9cc09ab18e [formerly 735893aab0]
Former-commit-id: bbaebe4fc0
 2015-01-26 11:22:49 -05:00
Nate Jensen
df3d12c6c4 Omaha #3952 remove custom gzip handling since it is by default enabled 
by apache httpclient

Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802

Former-commit-id: 7e8d355f62 [formerly 63189329a1] [formerly 7e8d355f62 [formerly 63189329a1] [formerly c4598baf19 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]]
Former-commit-id: c4598baf19
Former-commit-id: 4672329a75 [formerly dead055dca]
Former-commit-id: 4d96b2a212
 2015-01-26 09:10:36 -06:00
steve.naples
5734b0f998 ASM #17051 MPE: Daily QC will not display Points+Grids together. 
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a

Former-commit-id: 6811eb83a7 [formerly 6488242165] [formerly 6811eb83a7 [formerly 6488242165] [formerly 540ea64498 [formerly 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3]]]
Former-commit-id: 540ea64498
Former-commit-id: 7287103c0d [formerly b2b9d3905d]
Former-commit-id: df1504f781
 2015-01-23 20:40:48 +00:00
Nate Jensen
5db9791b67 Omaha #3952 disable cairo in alertviz for safety 
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f

Former-commit-id: dddc6c2cd4 [formerly 415e2d4035] [formerly dddc6c2cd4 [formerly 415e2d4035] [formerly 7c7c2e3a38 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]]
Former-commit-id: 7c7c2e3a38
Former-commit-id: 60227bcce2 [formerly c991d85bfd]
Former-commit-id: 9f82d7af10
 2015-01-23 12:57:24 -06:00
Steve Harris
fcdd2faaf1 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: 8cd9e2e92f [formerly 158fa16376] [formerly 8cd9e2e92f [formerly 158fa16376] [formerly 0f05c53a53 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]
Former-commit-id: 0f05c53a53
Former-commit-id: 5fda208a17 [formerly 033d0fc742]
Former-commit-id: c3d3d5f424
 2015-01-23 09:08:06 -06:00
Ana Rivera
c3ce42f75b VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945 
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278

Former-commit-id: de1b989253 [formerly 705f02f2be] [formerly de1b989253 [formerly 705f02f2be] [formerly 44fa40c0cc [formerly 653472d785f4af6fef8f2edd93c2e538806096ab]]]
Former-commit-id: 44fa40c0cc
Former-commit-id: 87f986052e [formerly d8f7ae400c]
Former-commit-id: f254d7d626
 2015-01-23 14:21:22 +00:00
Richard Peter
c9f7f32c39 Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1 
Former-commit-id: 4e80bdbd9e [formerly cc69519ce9] [formerly 4e80bdbd9e [formerly cc69519ce9] [formerly d7f79b859b [formerly 7591f6aa787a52c4fd2d6f9cb9917a1c62380fb5]]]
Former-commit-id: d7f79b859b
Former-commit-id: dcf2085324 [formerly 9d1f4ee011]
Former-commit-id: 85aa9fb637
 2015-01-22 19:13:09 -06:00
Mark Peters
841bf0150c Omaha #3768 Add localization to build.properties 
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30

Former-commit-id: 30229a25f2 [formerly db69f5a0bc] [formerly 30229a25f2 [formerly db69f5a0bc] [formerly 7a69f354d9 [formerly a6cafa7a07d33376cda3cc3a69437e45b6e0330f]]]
Former-commit-id: 7a69f354d9
Former-commit-id: a176434c41 [formerly 32dbdc345f]
Former-commit-id: c6fd704642
 2015-01-22 18:05:40 -06:00
Daniel.Huffman
8367208ad3 ASM #17057 RadarDecoder::AlertMessageSanityCheck 
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c

Former-commit-id: f4ac238888 [formerly 845998cbfa] [formerly f4ac238888 [formerly 845998cbfa] [formerly a25fa81a0f [formerly 498f55c757f20f70b11a921a2e5948c3c7c49c90]]]
Former-commit-id: a25fa81a0f
Former-commit-id: c5a37c5e9c [formerly 1fe93bcfa4]
Former-commit-id: ce963e91fa
 2015-01-22 21:13:04 +00:00
Shawn.Hooper
eefc3bd57d Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: 095a22f5e3 [formerly 314a8497f8] [formerly 095a22f5e3 [formerly 314a8497f8] [formerly 37c89530a6 [formerly 60d478ab66ac20c8434b9eb9e4d9f029390f0ba6]]]
Former-commit-id: 37c89530a6
Former-commit-id: dfd04fec4a [formerly c012f464c9]
Former-commit-id: 03fd6d11c5
 2015-01-22 16:05:52 -05:00
Shawn.Hooper
c1555d3133 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: 7839dab5e6 [formerly 0bc501bd4c] [formerly 7839dab5e6 [formerly 0bc501bd4c] [formerly a757b55446 [formerly d53c809149da23fcae51138cc45c57aecd641794]]]
Former-commit-id: a757b55446
Former-commit-id: e110ee143a [formerly 6cf71bae0e]
Former-commit-id: 953b71a3f8
 2015-01-22 16:05:41 -05:00
Dave Hladky
9af205777f Omaha #3918 Central registry web interface broken by DPA fix. 
Former-commit-id: 5fd928ec4c [formerly c1127b066f] [formerly 5fd928ec4c [formerly c1127b066f] [formerly a15e67385a [formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]]]
Former-commit-id: a15e67385a
Former-commit-id: f3f75d02dc [formerly 92fbbea65a]
Former-commit-id: 60efde53e6
 2015-01-22 13:22:18 -06:00
Ana Rivera
77a8e4a612 VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082 
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f

Former-commit-id: 4f8900fd23 [formerly 7b47ffe362] [formerly 4f8900fd23 [formerly 7b47ffe362] [formerly 18b9d5d163 [formerly 8a66266d3ffa236343f14089d7e7b32c1060f9ea]]]
Former-commit-id: 18b9d5d163
Former-commit-id: fc805be80c [formerly fd0aa2624d]
Former-commit-id: c63a8aa667
 2015-01-22 16:11:44 +00:00
Shawn.Hooper
0a224087c8 ASM #17054 - Disable MRMS Menu in 14.3.1 
Change-Id: I071606c7c14ed0332b3c714a67cebab29bfc67f0

Former-commit-id: 9e83601505 [formerly bd5dfed072] [formerly 9e83601505 [formerly bd5dfed072] [formerly d0b7b06d97 [formerly 7f6638dd595b99d6592c58af42f898e0f1b2a02a]]]
Former-commit-id: d0b7b06d97
Former-commit-id: 6f389bd80c [formerly dcf95652a7]
Former-commit-id: ac799987e3
 2015-01-21 12:44:47 -05:00
Juliya Dynina
190629173a 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: a72a325521 [formerly 64d09c6982] [formerly a72a325521 [formerly 64d09c6982] [formerly 7dfa9e281b [formerly 61f9feec5bf02baefbef740cc16cbc90688242ad]]]
Former-commit-id: 7dfa9e281b
Former-commit-id: 91e868e9fc [formerly 2c3d52ed49]
Former-commit-id: 6363ad547e
 2015-01-21 09:08:36 -05:00
Qinglu.Lin
4d81846dd1 ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's 
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1

Former-commit-id: 761fc43aad [formerly 94ee166aa1] [formerly 761fc43aad [formerly 94ee166aa1] [formerly 30b5bc6a62 [formerly d4e1fca39f82eb39fc911c091eb579a785a6cef9]]]
Former-commit-id: 30b5bc6a62
Former-commit-id: 2158f4d56b [formerly b85e72b5f8]
Former-commit-id: 1b6728d236
 2015-01-20 16:20:58 -05:00
Nate Jensen
1915c27938 ensure PGEN appears in thinclient D2D Tools menu 
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa

Former-commit-id: 7a10bd5620 [formerly bfcb36eeac] [formerly 7a10bd5620 [formerly bfcb36eeac] [formerly ac9d787a26 [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]]]
Former-commit-id: ac9d787a26
Former-commit-id: 74e207f306 [formerly 0b9a5965a0]
Former-commit-id: 86868080c3
 2015-01-20 11:52:37 -06:00
Fay.Liang
8b4e19c264 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 09d7176332 [formerly 7c3be2689c] [formerly 09d7176332 [formerly 7c3be2689c] [formerly 7ef58758ec [formerly 3f4dada7ef6880e8f6b07f208aeee8ce407e606c]]]
Former-commit-id: 7ef58758ec
Former-commit-id: 446ee6238d [formerly 001ac4294c]
Former-commit-id: 3b69dd0a2f
 2015-01-16 09:00:03 -05:00
Michael Gamazaychikov
7a28ba150f ASM #17035 - TextWS locks up when running spell checker. 
Change-Id: I7dd263367723f37e0ff3d368edcaca11d982a6b3

Former-commit-id: 3465706d3b [formerly a0ad2f7136] [formerly 3465706d3b [formerly a0ad2f7136] [formerly 544437c762 [formerly 1843d3a64ff42d0533016fd4bb126dd0c86f3f22]]]
Former-commit-id: 544437c762
Former-commit-id: e92486e70a [formerly 3947479184]
Former-commit-id: 96f46b2770
 2015-01-15 16:18:10 -05:00
Fay.Liang
4ef7a23776 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 532d0ea85d [formerly b5f51ea049] [formerly 532d0ea85d [formerly b5f51ea049] [formerly 2ccab30e31 [formerly f1ca6cef3bba0914aadbd4308511a9a96baaa9e5]]]
Former-commit-id: 2ccab30e31
Former-commit-id: 3eb3d287c0 [formerly 8285e6445d]
Former-commit-id: fce9647a3d
 2015-01-15 15:01:08 -05:00
Steve Harris
d0636548e3 Merge branch 'master_14.3.1' (14.3.1-42) into omaha_14.3.1 
Former-commit-id: 084a13971d [formerly a3bbb0ec69] [formerly 084a13971d [formerly a3bbb0ec69] [formerly a8de59017f [formerly 089467110734e982ec8c7916a48159828e03e75e]]]
Former-commit-id: a8de59017f
Former-commit-id: b84ddf693e [formerly 9bf5fc1570]
Former-commit-id: fb42c03797
 2015-01-15 13:27:21 -06:00
Nate Jensen
84379b24e2 Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1 
Former-commit-id: 0d1414e56b [formerly 16d862700a] [formerly 0d1414e56b [formerly 16d862700a] [formerly 865852c20c [formerly 6557237cd4cea3300292e1612622547c23bdde2c]]]
Former-commit-id: 865852c20c
Former-commit-id: 99dae46c58 [formerly c06e1c0adb]
Former-commit-id: 95bdbef8c4
 2015-01-15 13:07:10 -06:00
Evan Polster
0e16f1df15 VLab Issue #5963. Ensemble Tool Feature; fixes #5963 
Change-Id: I9f3c44fd80990b2ec60556d55fabade01eb4512f

Former-commit-id: e99c17a46a [formerly f361182baa] [formerly e99c17a46a [formerly f361182baa] [formerly 0d40df0d52 [formerly 28d2f4220fa6ef06f4fd1b729607c14b5d9534ac]]]
Former-commit-id: 0d40df0d52
Former-commit-id: 3d7a989840 [formerly 3d1ffb059a]
Former-commit-id: bb72452645
 2015-01-15 18:52:41 +00:00
David Lovely
62425dfbb3 Omaha #3957 Removed trailing slash in Spec for QPID. 
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5

Former-commit-id: 1f59c0cd21 [formerly 1cfc27241f] [formerly 1f59c0cd21 [formerly 1cfc27241f] [formerly cf4077e8cd [formerly 5fe598aef48f91e57d8f233872ccd0bab395164e]]]
Former-commit-id: cf4077e8cd
Former-commit-id: af5df71b4c [formerly f7565da27d]
Former-commit-id: 3babe6269f
 2015-01-15 08:16:18 -06:00
David Lovely
55fbb2ad86 Omaha #3957 Fixed path in Installer.edex-environment for QPID. 
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac

Former-commit-id: 2771afe7f4 [formerly 63c3631559] [formerly 2771afe7f4 [formerly 63c3631559] [formerly 0b7ee2dc08 [formerly 8107830bf2fa384c3bbe9472801c89a2a43990a3]]]
Former-commit-id: 0b7ee2dc08
Former-commit-id: 0fa33b0e84 [formerly f75e17f79e]
Former-commit-id: 49e435ede3
 2015-01-14 14:40:36 -06:00
Nate Jensen
b86874003f Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1 
Former-commit-id: 956845266c [formerly bdb58ec755] [formerly 956845266c [formerly bdb58ec755] [formerly 7c61d2c06d [formerly fa93fe561ae1ad49979ab657b4a537dc7731af8e]]]
Former-commit-id: 7c61d2c06d
Former-commit-id: fa79e80782 [formerly 4abf2a8a6c]
Former-commit-id: 4837ead714
 2015-01-14 14:05:18 -06:00
Brian Clements
0f521bee60 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: 17ccb3ab66 [formerly 1c2d8e01d0] [formerly 17ccb3ab66 [formerly 1c2d8e01d0] [formerly 8cc1aa9f33 [formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]]]
Former-commit-id: 8cc1aa9f33
Former-commit-id: ba13ccb6f0 [formerly 9a87cf77c5]
Former-commit-id: 61b3b6389e
 2015-01-14 13:00:25 -06:00
Greg Armendariz
c7552ebaf9 Merge "Omaha #3957 Fixed path in Installer.edex-environment for QPID." into omaha_14.4.1 
Former-commit-id: 6bdaf0b924 [formerly 6c7e615de5] [formerly 6bdaf0b924 [formerly 6c7e615de5] [formerly 0431783330 [formerly 7c37c3ef1e9822a988f2f3aff9e884fbe48dce9c]]]
Former-commit-id: 0431783330
Former-commit-id: afe39c3dd6 [formerly fff75342eb]
Former-commit-id: 89c4169e18
 2015-01-14 11:33:29 -06:00
David Lovely
4467128c35 Omaha #3957 Fixed path in Installer.edex-environment for QPID. 
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9

Former-commit-id: e4dbe403b3 [formerly 9b9d569062] [formerly e4dbe403b3 [formerly 9b9d569062] [formerly f75230366c [formerly 34faf643b5de3c01713e0129209efb4ccc2c2aa0]]]
Former-commit-id: f75230366c
Former-commit-id: e8150e977c [formerly 5bbea995ae]
Former-commit-id: 9316cbc4a4
 2015-01-14 11:28:56 -06:00
Fay.Liang
b5a1e3f5dc Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: e8c2643b18 [formerly deb2adb1fc] [formerly e8c2643b18 [formerly deb2adb1fc] [formerly d231c178ac [formerly e64a61bb41b43b995a6b6e3b3c468aa0fa3c84ed]]]
Former-commit-id: d231c178ac
Former-commit-id: f6a25f17f2 [formerly 40434cd59a]
Former-commit-id: 1bc7e88709
 2015-01-14 12:01:19 -05:00
Ben Steffensmeier
79d0ce0b70 Omaha #3966 Limit the number of flags on wind barbs. 
Former-commit-id: dad3e9ed8c [formerly 22f13c9f08] [formerly dad3e9ed8c [formerly 22f13c9f08] [formerly 3a6bce1100 [formerly 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d]]]
Former-commit-id: 3a6bce1100
Former-commit-id: f7d8dae6b9 [formerly 7d9ff47dfa]
Former-commit-id: 4b253097a1
 2015-01-13 17:21:43 -06:00
Nate Jensen
7a14b2de0c Omaha #3993 ensure important dataplugin utility folders are included in 
viz builds

Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747

Former-commit-id: f88f62191f [formerly 05307be9d0] [formerly f88f62191f [formerly 05307be9d0] [formerly b434ae1343 [formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]]]
Former-commit-id: b434ae1343
Former-commit-id: 9df5c9249b [formerly 39ab8668fa]
Former-commit-id: 69d8073d94
 2015-01-13 16:47:04 -06:00
Ron Anderson
9b9d487ad6 Omaha #3997 Create script for sites to use to compare AreaDictionary.py files 
Change-Id: I0b76c40ffe70d1df9d9379deca4bdc0276a723fd

Former-commit-id: d4ccf1c538 [formerly ce0fa19f7b] [formerly d4ccf1c538 [formerly ce0fa19f7b] [formerly b8fdaf17a4 [formerly 23b10f94f9ff892fdbff654e6fefbd4b3c914f58]]]
Former-commit-id: b8fdaf17a4
Former-commit-id: 4919681992 [formerly b5f578a4e1]
Former-commit-id: a8d2a64bd7
 2015-01-13 15:11:42 -06:00
Ron Anderson
a04c7694d0 Omaha #3997 Create delta script to preserve the site's current AreaDictionary.py file 
Change-Id: Id38826c171ed6d87fd8b677c53df7e2a6b49254c

Former-commit-id: 699573558f [formerly 690861d350] [formerly 699573558f [formerly 690861d350] [formerly 82aa416c48 [formerly 9da286a579c582db47d63aba83552f5361d819e0]]]
Former-commit-id: 82aa416c48
Former-commit-id: 7aaaf55ea8 [formerly ac7a6945f8]
Former-commit-id: 4af148d7f0
 2015-01-13 14:32:50 -06:00
Fay.Liang
70350e7c9a 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: 1934dedd2d [formerly 13fb781066] [formerly 1934dedd2d [formerly 13fb781066] [formerly a09a27a963 [formerly 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290]]]
Former-commit-id: a09a27a963
Former-commit-id: 10a0b78dcc [formerly 50513e1655]
Former-commit-id: c87c390019
 2015-01-13 14:35:30 -05:00
Steve Harris
a48309ec20 Merge branch 'omaha_14.4.1' into omaha_pgen 
Former-commit-id: 661a03c719 [formerly 8cc8138832] [formerly 661a03c719 [formerly 8cc8138832] [formerly ed189dc7cf [formerly f742cb887192183a29f4984d7f95a299cad9867a]]]
Former-commit-id: ed189dc7cf
Former-commit-id: e644bd0ae9 [formerly 7a097bdff6]
Former-commit-id: 1cc817f1f8
 2015-01-13 11:18:52 -06:00
Ron Anderson
46f8beb27d Issue #3990 Remove multiple smartInit restriction added by DR #3146 
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516

Former-commit-id: 6248c878ff [formerly 03c265fc9f] [formerly 6248c878ff [formerly 03c265fc9f] [formerly 0dab6f4797 [formerly c4ba2394228935c7725688c11b91c3de130d586b]]]
Former-commit-id: 0dab6f4797
Former-commit-id: 6e2c48ea00 [formerly 4abb7e718b]
Former-commit-id: f346f84150
 2015-01-13 11:03:02 -06:00
Fay.Liang
8343167b2a Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: d149865087 [formerly b7e84f200a] [formerly d149865087 [formerly b7e84f200a] [formerly 98fbb1fa0f [formerly 1627b2a1d7705ae60f8f18545460d29fed1acf3a]]]
Former-commit-id: 98fbb1fa0f
Former-commit-id: 3434d9f4c6 [formerly cc02fbcc3e]
Former-commit-id: d3e766a96c
 2015-01-13 11:58:33 -05:00
Fay.Liang
5c87d2ba60 Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 1ee2bb76da [formerly ffa13d9264] [formerly 1ee2bb76da [formerly ffa13d9264] [formerly a7708f9cf5 [formerly f0ed1b055a21c765e6dec0dde0a066089892dd06]]]
Former-commit-id: a7708f9cf5
Former-commit-id: 275c6677f4 [formerly b931ef5f42]
Former-commit-id: 3f8b726c7d
 2015-01-13 11:58:25 -05:00
Nathan Jensen
937753228b Merge "VLab Issue #5413 - Changes for PGEN in D2D for mouse click" into omaha_pgen 
Former-commit-id: 3fa8a587cd [formerly 0f8d012034] [formerly 3fa8a587cd [formerly 0f8d012034] [formerly 2b36b2419e [formerly 76b63bd71b9c38d5c85906df6be75db0b31fed8c]]]
Former-commit-id: 2b36b2419e
Former-commit-id: 7840fff904 [formerly df93add438]
Former-commit-id: 5056a5230a
 2015-01-13 16:48:36 +00:00
Fay.Liang
d4af06efe5 Merge branch 'master_14.3.1' into master_14.3.2 
Former-commit-id: 2b6bb69ec1 [formerly 5582b8e999] [formerly 2b6bb69ec1 [formerly 5582b8e999] [formerly 16c7a1742c [formerly 35b63703798294e9c28c6aa1d5884a41c0538e09]]]
Former-commit-id: 16c7a1742c
Former-commit-id: c9f8810d39 [formerly 7fc1989ad8]
Former-commit-id: 5f18b95320
 2015-01-13 11:41:48 -05:00
Sarah Pontius
309585993b VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879 
Change-Id: I0418ffe2cb01337f8549ea2c8021a8e5b566b563

Former-commit-id: 43bab0465c [formerly 4bacb954fe] [formerly 43bab0465c [formerly 4bacb954fe] [formerly 283f682aea [formerly 01f727b4b033f80a206533cbf5404c38d12a6fde]]]
Former-commit-id: 283f682aea
Former-commit-id: cc46b5e4e5 [formerly 1d3b410f7c]
Former-commit-id: c6d6e03ee2
 2015-01-13 09:04:28 -07:00
cmadmin
c95f832d12 Merge "Omaha #3957 Moved QPID to build repository directory structure." into omaha_14.4.1 
Former-commit-id: b9fac8ae47 [formerly 5b796ff2f8] [formerly b9fac8ae47 [formerly 5b796ff2f8] [formerly 478e3825ae [formerly 455b763fd46e6053e272854e89074cdb898d4a6c]]]
Former-commit-id: 478e3825ae
Former-commit-id: 8d5cd7a6d6 [formerly b5c3233880]
Former-commit-id: 4e04d6093e
 2015-01-13 09:14:43 -06:00
Nate Jensen
2ab1455029 Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1 
Former-commit-id: bb5b975ae0 [formerly 65a0433605] [formerly bb5b975ae0 [formerly 65a0433605] [formerly 511ba87c5c [formerly d7cc45aa26f71ad81d82dc1dfa2541e105b4c76c]]]
Former-commit-id: 511ba87c5c
Former-commit-id: 7d2f617c95 [formerly a9e4546f6a]
Former-commit-id: e75e025fe4
 2015-01-12 13:59:25 -06:00
Fay.Liang
696bb730da Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: a713238fc1 [formerly d193ca5eb6] [formerly a713238fc1 [formerly d193ca5eb6] [formerly 50ab069dbc [formerly f0c6dcb30718baede5c31bcb267d3b4524252ab8]]]
Former-commit-id: 50ab069dbc
Former-commit-id: 2e6600f969 [formerly e95f66b7f7]
Former-commit-id: 354cd089e9
 2015-01-12 14:55:55 -05:00
Slav Korolev
7c7c14b192 Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers. 
Former-commit-id: f08d184cfc [formerly 9c57dab437] [formerly f08d184cfc [formerly 9c57dab437] [formerly b8ab18d3e1 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]]]
Former-commit-id: b8ab18d3e1
Former-commit-id: 6c73aca047 [formerly 790a79e752]
Former-commit-id: a6e0502c58
 2015-01-12 14:32:31 -05:00
steve.naples
49e3d56192 ASM #16993 - Restored code to DrawPolygonDlg to use Combo box for fields. 
Change-Id: I736af4ac43de16c3978c462fca22bb147846d81b

Former-commit-id: 8d24e3800c [formerly ac7d038488] [formerly 8d24e3800c [formerly ac7d038488] [formerly 9a38ed0b4d [formerly 3a8aaf4ab99e8ae93dd9f074c5671cc8f3dc5f8d]]]
Former-commit-id: 9a38ed0b4d
Former-commit-id: 72ada1bba5 [formerly 122b1721c3]
Former-commit-id: a6a9c3b2e7
 2015-01-12 19:08:06 +00:00
Fay.Liang
1e9024ede9 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: 6b77894bd0 [formerly c6bd5d7675] [formerly 6b77894bd0 [formerly c6bd5d7675] [formerly eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]
Former-commit-id: eed6737801
Former-commit-id: f3ecae8573 [formerly 5cc8e5b4af]
Former-commit-id: 06ac6b396e
 2015-01-12 13:03:31 -05:00
Ana Rivera
bf794d20ca 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: 9efaf97304 [formerly 3a08e54bfc] [formerly 9efaf97304 [formerly 3a08e54bfc] [formerly a07ca6b040 [formerly 07634aa73cbb07182302518513a54ded9fd69641]]]
Former-commit-id: a07ca6b040
Former-commit-id: f1ca09088a [formerly 276357d367]
Former-commit-id: 925ce2d298
 2015-01-12 17:43:07 +00:00