Ron Anderson
6b51b05bdf
Merge "Issue #2721 Fix error when activeSites.txt contains blank lines." into development
...
Former-commit-id: e665fa251dab6afb16d5a3863aac0815e84a00d4
2014-03-10 18:07:17 -05:00
Ron Anderson
3af33de29b
Issue #2721 Fix error when activeSites.txt contains blank lines.
...
Change-Id: I76b9b21134907f5297bae5fb106334ed54f5b6ac
Former-commit-id: d711aa3552e660aba1ac885c0767bab8c856da54
2014-03-10 17:57:43 -05:00
Ron Anderson
f7f49ef1cb
Merge "Issue #2824 Fix null at end of validation message." into development
...
Former-commit-id: 2b79c54340f7a2bb9492435117db77bb9c6d01a3
2014-03-10 17:54:51 -05:00
Ron Anderson
ac39b1accb
Issue #2824 Fix null at end of validation message.
...
Change-Id: Ifdf54cabf0b3bc44e7492c8a4d8a5f1969e4daa1
Former-commit-id: 24ae011033b851364e4c6efe98488c4066cfd042
2014-03-10 17:42:55 -05:00
Nate Jensen
722216e319
Merge "Issue #2848 fixed session create, listen, join ordering" into development
...
Former-commit-id: 89427f93a4459a2f5feeac4f9df00db3143eb998
2014-03-10 17:36:06 -05:00
Steve Harris
4c52fb5bb3
Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development
...
Former-commit-id: 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3
2014-03-10 16:01:16 -05:00
Ben Steffensmeier
e75b961db5
Issue #2867 Better validation of image export frame range.
...
Former-commit-id: 6a3a62b913de1d508fb0d470d06a8be4a61918a3
2014-03-10 15:24:07 -05:00
Ben Steffensmeier
f88e1c329e
Issue #2791 Add numeric to alertViz feature.
...
Former-commit-id: 9918eeec97938cbc7c703738800521773fbb4a87
2014-03-10 14:55:54 -05:00
Brian.Dyke
c6f2010ce6
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 0e02910adc2ef73df2eff5b41c1e9945a5536a0a
2014-03-10 15:42:38 -04:00
brian.dyke
654778bb0d
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
...
Former-commit-id: 9dba33a7122e20c0502b2bf8036ec875e957798b
2014-03-10 15:36:56 -04:00
Brian.Dyke
d710aec521
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: ac54324fb0eff1483dd2c3aa8d94273760451dab
2014-03-10 15:14:59 -04:00
Brian Clements
dc55cd5b5c
Issue #2848 fixed session create, listen, join ordering
...
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions
Former-commit-id: e832f6420b6363a3c951725e0d23f460b2efb42e
2014-03-10 14:06:45 -05:00
Nate Jensen
43de990a4c
Merge "Issue #2673 Fix name of lighning data factory." into development
...
Former-commit-id: 5c828c0ddfdf6e29ddfaf706409edda5fb307ade
2014-03-10 13:53:45 -05:00
Nate Jensen
9cb27d5e95
Merge "Issue #2832 consolidate watch and warning recycle logic" into development
...
Former-commit-id: 4029d0d863bf6da254859028353a271dec70e335
2014-03-10 13:52:53 -05:00
Ben Steffensmeier
019cf9c943
Issue #2673 Fix name of lighning data factory.
...
Former-commit-id: 86e3270b88336978cfa799fae402aa350b6dcac2
2014-03-10 13:35:34 -05:00
Nate Jensen
057f7671a0
Issue #2832 consolidate watch and warning recycle logic
...
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889
Former-commit-id: 814d21d0a5b58c95f6339e1816788953692f5e95
2014-03-10 13:02:45 -05:00
Richard Peter
6581f2b3f4
Merge "Issue #2876 - removed import, changed jave version to 1.6" into development
...
Former-commit-id: 61e13e5e81ee25d4c0be9c80b4e6970f4cf0f3e6
2014-03-10 12:53:15 -05:00
Mike Duff
63b9452c3f
Issue #2876 - removed import, changed jave version to 1.6
...
Change-Id: Ia2806bff0b7042983c6dd7498c76a66c8c277a29
Former-commit-id: 8ce84ce824a852ad08e70fd272d2bc62b02ef292
2014-03-10 12:49:27 -05:00
Lee Venable
f9d019f0dc
Merge "Issue #2807 . Added MalformedDataException for VAA decoding." into development
...
Former-commit-id: 4094bd9c9eb40db9a93e679bb09fba1bea1d8639
2014-03-10 11:52:25 -05:00
Nate Jensen
4c7bda09c0
Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development
...
Former-commit-id: 99c2f252cab0901cedfefa5e2a6d6799f7e29db8
2014-03-10 11:36:16 -05:00
Slav Korolev
8391b1098e
Issue #2807 . Added MalformedDataException for VAA decoding.
...
Former-commit-id: 085c10211b1fa397ca54b8d4d316055f9225db0c
2014-03-10 12:31:57 -04:00
Nate Jensen
6a75fe686a
Issue #2779 add .ini generation of memory settings for other components
...
Former-commit-id: 71a7f485c5a32caeabc98f23164c9fc87cfa1787
2014-03-10 10:03:02 -05:00
Nate Jensen
c247535b96
Merge "Issue #2876 - move NDM plugin feature entry." into development
...
Former-commit-id: 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88
2014-03-10 09:49:28 -05:00
Mike Duff
6be6181108
Issue #2876 - move NDM plugin feature entry.
...
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f
Former-commit-id: a3b334c9269a9753af0f2dd9f6507aef23177b9f
2014-03-10 09:45:04 -05:00
Nate Jensen
e787cac9af
Merge "Issue #2751 ensured that room admins know real userids" into development
...
Former-commit-id: e6feac94800c2dd82afcf42ca9f387b24514deff
2014-03-10 09:15:39 -05:00
Nate Jensen
f5a08f1f86
Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development
...
Former-commit-id: 24492229a0bddc3db1b6945fcd2a89a486f1ef2e
2014-03-10 09:04:51 -05:00
Ben Steffensmeier
9122b6da99
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: ba5ff870337c7ac66d633077d84de867e5df967c
2014-03-07 18:15:32 -06:00
Stephen Gilbert
65dd8b4c3c
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
...
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: 459cd2e6772efa05a683073798a1d4424aa2facf
2014-03-07 19:10:08 -05:00
Stephen Gilbert
9a457213bb
VLab Issue #3223 - NSHARP: Improve selection operation
...
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: 16fcc171c65d79d5698feeb3ff0ace49c31d976f
2014-03-07 19:07:28 -05:00
Stephen Gilbert
1632166902
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: 24e07a3215a7879e459afc74e020eab0a8e1c646
2014-03-07 18:49:21 -05:00
Stephen Gilbert
625fcb0064
VLab Issue #3221 - Fix XML serialization problems
...
A few problems reading/writing XML files were noticed after upgrading to
14.2.1. This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.
Change-Id: I8aad4197029c70f72612299a25329687892884af
Former-commit-id: 4f58998c899e28521658bf17dee852592c534713
2014-03-07 18:36:42 -05:00
Steve Harris
873bd6b889
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 7d94859f45aaa3d732cbb25fc55348996cfe481c
2014-03-07 15:43:40 -06:00
Mike Duff
618dbec585
Issue #2876 - Fix manifest file.
...
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9
Former-commit-id: 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48
2014-03-07 15:41:24 -06:00
Brian Clements
44d161729f
Issue #2751 ensured that room admins know real userids
...
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer
Former-commit-id: b3bf76b676b7e75559236d67c687cd5011859a8b
2014-03-07 15:37:29 -06:00
Steve Harris
92232fa063
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
2014-03-07 15:16:18 -06:00
Shawn.Hooper
41a4905f9f
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: b18b8f64040b1c41810f391b8ed785327b6e5d59
2014-03-07 14:53:54 -05:00
Richard Peter
4568108a3c
Merge "Issue #2876 - Pluginize NDM review comments" into development
...
Former-commit-id: 296f8f835cbc87783f0f50278d2148f756cf6296
2014-03-07 13:04:14 -06:00
Mike Duff
944fca16b8
Issue #2876 - Pluginize NDM
...
review comments
Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d
Former-commit-id: 2f1aa28a4389c15e20724ebc8d79501c338f565e
2014-03-07 12:47:46 -06:00
Shawn.Hooper
670da1895b
ASM #377 - Baseline National River Location Database fails
...
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 5dcb5b019f389e64435b0283d95fe477032d88cc
2014-03-07 13:12:11 -05:00
Shawn.Hooper
8c9f9b3ae0
ASM #378 - MPE gages are not listed/available in gage table
...
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: 55b1066b8674a044602297e64cb557ced5faf92a
2014-03-07 12:57:36 -05:00
Brian.Dyke
3ac2a61218
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 8b6d5b889e652cbf82c66ae831c9c116626c1494
2014-03-07 11:50:06 -05:00
David Friedman
2c1a3442d6
ASM #349 - Workaround for QPID-5569
...
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: 18d692c17ea11537d0eb832fbe63a04b59b0040c
2014-03-07 14:58:09 +00:00
Brian.Dyke
394076196b
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7
2014-03-07 09:01:09 -05:00
Brian.Dyke
312cd8a3e8
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: bb169bc0992f28fe1527cb0106771c35415cea24
2014-03-07 08:57:07 -05:00
Brian.Dyke
21f17d4f9b
14.1.1-22 baseline
...
Former-commit-id: ae37ad5bac445251d1456f37588819fccfede061
2014-03-07 08:49:00 -05:00
Steve Harris
8b6263bfbd
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 857ae00bea95a7981cb4752c1a7c147d725173e3
2014-03-06 18:31:10 -06:00
Steve Harris
7f1ad89df9
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 22538918b8a7175bbb517cbf65ec3738e65a6eb2
2014-03-06 18:19:55 -06:00
Nate Jensen
7fa8bf636f
Issue #2826 fix collaboration mosaic image disposed issue
...
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614
Former-commit-id: 50b3e6bb7fcee54f1199b78354d404f325b32773
2014-03-06 18:07:40 -06:00
Brad Gonzales
2e224094ad
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: d1f3c5e508cf268198531a31fd3a91faba0159df
2014-03-06 17:35:43 -06:00
Brad Gonzales
0e3dc17872
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: 6d2a542774db6c37cfc2a65f490ebf618f2e7954
2014-03-06 16:29:37 -06:00
