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

4981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Gonzales
0a973030c4 Issue #2702 Updated openfire version in component spec. 
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498

Former-commit-id: c7d06ff946 [formerly ccb312d46f] [formerly c7d06ff946 [formerly ccb312d46f] [formerly bf0d052043 [formerly 276c38754b7f917c229750ce06d387a8b63245d4]]]
Former-commit-id: bf0d052043
Former-commit-id: ec34591f08 [formerly dae0963531]
Former-commit-id: 1049855e4d
 2014-03-12 08:48:36 -05:00
Greg Armendariz
87087b3ffc Merge "Issue #2851 - initial 64-bit build of the bignsharp DLL" into development 
Former-commit-id: 195383130c [formerly da34c3d2da] [formerly 195383130c [formerly da34c3d2da] [formerly 6acf5fefcc [formerly 5346beaf24ad66cfffab9e115c8d22b4c2fe2f95]]]
Former-commit-id: 6acf5fefcc
Former-commit-id: 9f51095c62 [formerly 2aa74592d7]
Former-commit-id: 32ba7d7c93
 2014-03-11 19:56:55 -05:00
Lee Venable
d5a9ae9d79 Merge "Issue #2865 - added more null and dispose checks" into development 
Former-commit-id: 6d02134d89 [formerly ae63879ddf] [formerly 6d02134d89 [formerly ae63879ddf] [formerly 36f72f23dc [formerly 5c21cbb43cda9274a77b2358749ba53b397ef0e1]]]
Former-commit-id: 36f72f23dc
Former-commit-id: 2e127e20eb [formerly d7fc7f791d]
Former-commit-id: 8d909c1b14
 2014-03-11 17:43:48 -05:00
Nate Jensen
df12abb511 Merge "Issue #2791 Fix fill value filter." into development 
Former-commit-id: 2c6ca9840c [formerly 80a2807ce4] [formerly 2c6ca9840c [formerly 80a2807ce4] [formerly 249d0f3ded [formerly 871280fb9fac9b09908243b1753abb087b204f23]]]
Former-commit-id: 249d0f3ded
Former-commit-id: 0fc7fde66d [formerly 266e87f935]
Former-commit-id: 651bb4ec5f
 2014-03-11 17:33:54 -05:00
Ben Steffensmeier
d63c31cd0a Issue #2791 Fix fill value filter. 
Former-commit-id: 538fb61ae0 [formerly 4eb2d74e1c] [formerly 538fb61ae0 [formerly 4eb2d74e1c] [formerly 1a45efe2a5 [formerly e845b829ba4518ac41f0ac26c22c3d83a5504375]]]
Former-commit-id: 1a45efe2a5
Former-commit-id: 6df4977dc2 [formerly c754db3ae3]
Former-commit-id: 345ec7fa6a
 2014-03-11 17:27:26 -05:00
Bryan Kowal
3440a5b64c Issue #2851 - initial 64-bit build of the bignsharp DLL 
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll: PE32 executable for MS Windows (DLL) (console) Intel 80386 32-bit
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll: PE32+ executable for MS Windows (DLL) (console) Mono/.Net assembly

Amend: update Java version and Plugin version

Change-Id: I377e8b51eb9d7fd9964092040d1bcde3f9bcfd27

Former-commit-id: b0de1fba76 [formerly cac6709da8] [formerly b0de1fba76 [formerly cac6709da8] [formerly 438e594868 [formerly 3189f870d55219372438213441fd1359a6bb5cc4]]]
Former-commit-id: 438e594868
Former-commit-id: fe9b652d52 [formerly 9ec8e864a7]
Former-commit-id: 2c101a12dd
 2014-03-11 16:47:11 -05:00
Lee Venable
66a87595af Issue #2865 - added more null and dispose checks 
Former-commit-id: fe6e7328c0 [formerly df65d7c7ce] [formerly fe6e7328c0 [formerly df65d7c7ce] [formerly 1f9d1af221 [formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]
Former-commit-id: 1f9d1af221
Former-commit-id: 8ef7fe57c4 [formerly 46fa017e1b]
Former-commit-id: 0931ce72c9
 2014-03-11 16:30:33 -05:00
Nate Jensen
9a38340021 Merge "Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory. Added a -buildRPM target to build.sh to build a specific RPM." into development 
Former-commit-id: 221b57892c [formerly 1b11e23257] [formerly 221b57892c [formerly 1b11e23257] [formerly a1bf3e9874 [formerly 8d4e32df3a8374e571a3a9d3994e45ea825c418f]]]
Former-commit-id: a1bf3e9874
Former-commit-id: 5b57abd527 [formerly 2e21069300]
Former-commit-id: 8e0947136f
 2014-03-11 12:35:53 -05:00
Nate Jensen
0631214f1a Merge "Issue #2900 Added NWSAuth to import for DD viz feature" into development 
Former-commit-id: 8e0fff8bb4 [formerly a1533481b3] [formerly 8e0fff8bb4 [formerly a1533481b3] [formerly 4ee98a10cd [formerly 22518ce352166afc70950d631b5df8cbcc063a3d]]]
Former-commit-id: 4ee98a10cd
Former-commit-id: c0ee40b137 [formerly abe081b019]
Former-commit-id: 687b47272a
 2014-03-11 11:30:27 -05:00
Brad Gonzales
0b558f0c93 Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work 
with openfire 3.9.1.  Updated package.sh to use openfire tar from awips2-static directory.
Added a -buildRPM target to build.sh to build a specific RPM.

Change-Id: I3502e42d92d519968aeb8b5fbc1f38b277f48c6a

Former-commit-id: cbac19d219 [formerly 09d27e99b5] [formerly cbac19d219 [formerly 09d27e99b5] [formerly 48b6c75bb3 [formerly 606b269f39ed58e855d9fcba2487fccbaac3c28c]]]
Former-commit-id: 48b6c75bb3
Former-commit-id: f53845738c [formerly 5d5ab33db3]
Former-commit-id: b7df208cd7
 2014-03-11 11:27:44 -05:00
Dave Hladky
493246236c Issue #2900 Added NWSAuth to import for DD viz feature 
Former-commit-id: e3701c0810 [formerly a2a66b028d] [formerly e3701c0810 [formerly a2a66b028d] [formerly 171bb37b0a [formerly 9800d488dfb626c12b8b84f34af06dbbd7d574b0]]]
Former-commit-id: 171bb37b0a
Former-commit-id: 7e384d27a1 [formerly b1fc6536c9]
Former-commit-id: be0cfc0afe
 2014-03-11 11:04:34 -05:00
Lee Venable
374a2da1a1 Issue #2865 - fixed font memory leak 
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 44733489b9 [formerly 2c67c4f6c4] [formerly 44733489b9 [formerly 2c67c4f6c4] [formerly 58d7f759b2 [formerly 2555d382f26278c5f972c17da778338142cdaaec]]]
Former-commit-id: 58d7f759b2
Former-commit-id: 86e6547a63 [formerly a5487de998]
Former-commit-id: 97a124ca58
 2014-03-11 10:31:50 -05:00
Ron Anderson
178a11fc31 Merge "Issue #2721 Fix error when activeSites.txt contains blank lines." into development 
Former-commit-id: bd57a18a29 [formerly 6b51b05bdf] [formerly bd57a18a29 [formerly 6b51b05bdf] [formerly f3a6acaf48 [formerly e665fa251dab6afb16d5a3863aac0815e84a00d4]]]
Former-commit-id: f3a6acaf48
Former-commit-id: d6d544bc3b [formerly 7b272e271c]
Former-commit-id: 9d60bad8f7
 2014-03-10 18:07:17 -05:00
Ron Anderson
9c4976829c Issue #2721 Fix error when activeSites.txt contains blank lines. 
Change-Id: I76b9b21134907f5297bae5fb106334ed54f5b6ac

Former-commit-id: 3cf3a9e70c [formerly 3af33de29b] [formerly 3cf3a9e70c [formerly 3af33de29b] [formerly aa62ab0fd8 [formerly d711aa3552e660aba1ac885c0767bab8c856da54]]]
Former-commit-id: aa62ab0fd8
Former-commit-id: 507d8a63f8 [formerly 7621944608]
Former-commit-id: 81d9adbcbb
 2014-03-10 17:57:43 -05:00
Ron Anderson
4c63d6802f Merge "Issue #2824 Fix null at end of validation message." into development 
Former-commit-id: bf7a958302 [formerly f7f49ef1cb] [formerly bf7a958302 [formerly f7f49ef1cb] [formerly 199b6eb3fd [formerly 2b79c54340f7a2bb9492435117db77bb9c6d01a3]]]
Former-commit-id: 199b6eb3fd
Former-commit-id: bc0d3ca667 [formerly fb5036b1d4]
Former-commit-id: 110a505353
 2014-03-10 17:54:51 -05:00
Ron Anderson
6eb48ac9cc Issue #2824 Fix null at end of validation message. 
Change-Id: Ifdf54cabf0b3bc44e7492c8a4d8a5f1969e4daa1

Former-commit-id: 61148935cf [formerly ac39b1accb] [formerly 61148935cf [formerly ac39b1accb] [formerly f0294a3ff8 [formerly 24ae011033b851364e4c6efe98488c4066cfd042]]]
Former-commit-id: f0294a3ff8
Former-commit-id: f2f1f95863 [formerly b3b6d93b4c]
Former-commit-id: 4494ed5b20
 2014-03-10 17:42:55 -05:00
Nate Jensen
f4dbdb33a3 Merge "Issue #2848 fixed session create, listen, join ordering" into development 
Former-commit-id: 64b7c84018 [formerly 722216e319] [formerly 64b7c84018 [formerly 722216e319] [formerly fb2677db7d [formerly 89427f93a4459a2f5feeac4f9df00db3143eb998]]]
Former-commit-id: fb2677db7d
Former-commit-id: ac028d6583 [formerly 9633d5f252]
Former-commit-id: aa096c1e2e
 2014-03-10 17:36:06 -05:00
Steve Harris
b40eee35c7 Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development 
Former-commit-id: e62a399e9f [formerly 4c52fb5bb3] [formerly e62a399e9f [formerly 4c52fb5bb3] [formerly cfc9fea413 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]]
Former-commit-id: cfc9fea413
Former-commit-id: 0c0bc58b3e [formerly 57f2a3204e]
Former-commit-id: 51150e544b
 2014-03-10 16:01:16 -05:00
Ben Steffensmeier
e0a784d6bc Issue #2867 Better validation of image export frame range. 
Former-commit-id: bde80aec1b [formerly e75b961db5] [formerly bde80aec1b [formerly e75b961db5] [formerly cc8b71fbdf [formerly 6a3a62b913de1d508fb0d470d06a8be4a61918a3]]]
Former-commit-id: cc8b71fbdf
Former-commit-id: 77e3f15d0b [formerly 9c82499818]
Former-commit-id: 3afc79f90f
 2014-03-10 15:24:07 -05:00
Ben Steffensmeier
5f4a8fb516 Issue #2791 Add numeric to alertViz feature. 
Former-commit-id: 525f6b19bf [formerly f88e1c329e] [formerly 525f6b19bf [formerly f88e1c329e] [formerly 2f75103635 [formerly 9918eeec97938cbc7c703738800521773fbb4a87]]]
Former-commit-id: 2f75103635
Former-commit-id: db9729ef73 [formerly eaa570c3f2]
Former-commit-id: 1ef88aa125
 2014-03-10 14:55:54 -05:00
Brian Clements
c4e9aff9fc 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: 2456c2308f [formerly dc55cd5b5c] [formerly 2456c2308f [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 3486f1f241 [formerly 4f9a2577f2]
Former-commit-id: 6245b550aa
 2014-03-10 14:06:45 -05:00
Nate Jensen
e9c6953542 Merge "Issue #2673 Fix name of lighning data factory." into development 
Former-commit-id: c2c596b6bc [formerly 43de990a4c] [formerly c2c596b6bc [formerly 43de990a4c] [formerly 873f06e85e [formerly 5c828c0ddfdf6e29ddfaf706409edda5fb307ade]]]
Former-commit-id: 873f06e85e
Former-commit-id: 5e3ecd33fa [formerly ffbc63b67a]
Former-commit-id: ee5e5e1a47
 2014-03-10 13:53:45 -05:00
Nate Jensen
5b9fdc7612 Merge "Issue #2832 consolidate watch and warning recycle logic" into development 
Former-commit-id: 89cdc44635 [formerly 9cb27d5e95] [formerly 89cdc44635 [formerly 9cb27d5e95] [formerly 2570c295d5 [formerly 4029d0d863bf6da254859028353a271dec70e335]]]
Former-commit-id: 2570c295d5
Former-commit-id: f48251da57 [formerly cab7dadbe8]
Former-commit-id: 035cf99c65
 2014-03-10 13:52:53 -05:00
Ben Steffensmeier
eb97156ba0 Issue #2673 Fix name of lighning data factory. 
Former-commit-id: 89eeb243ec [formerly 019cf9c943] [formerly 89eeb243ec [formerly 019cf9c943] [formerly bd7d250cec [formerly 86e3270b88336978cfa799fae402aa350b6dcac2]]]
Former-commit-id: bd7d250cec
Former-commit-id: 93b5fba876 [formerly abad6524ed]
Former-commit-id: 34b005b19f
 2014-03-10 13:35:34 -05:00
Nate Jensen
7731f09550 Issue #2832 consolidate watch and warning recycle logic 
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889

Former-commit-id: 8e734f917e [formerly 057f7671a0] [formerly 8e734f917e [formerly 057f7671a0] [formerly 8cd98e0b9f [formerly 814d21d0a5b58c95f6339e1816788953692f5e95]]]
Former-commit-id: 8cd98e0b9f
Former-commit-id: 39f2a03d21 [formerly 1646574f5a]
Former-commit-id: 33d7e39376
 2014-03-10 13:02:45 -05:00
Richard Peter
31493b809f Merge "Issue #2876 - removed import, changed jave version to 1.6" into development 
Former-commit-id: 9585896021 [formerly 6581f2b3f4] [formerly 9585896021 [formerly 6581f2b3f4] [formerly 7a2409f488 [formerly 61e13e5e81ee25d4c0be9c80b4e6970f4cf0f3e6]]]
Former-commit-id: 7a2409f488
Former-commit-id: 505b86cf19 [formerly 92568811c7]
Former-commit-id: cda2b0e040
 2014-03-10 12:53:15 -05:00
Mike Duff
d09c635f80 Issue #2876 - removed import, changed jave version to 1.6 
Change-Id: Ia2806bff0b7042983c6dd7498c76a66c8c277a29

Former-commit-id: f6db852657 [formerly 63b9452c3f] [formerly f6db852657 [formerly 63b9452c3f] [formerly 419293a946 [formerly 8ce84ce824a852ad08e70fd272d2bc62b02ef292]]]
Former-commit-id: 419293a946
Former-commit-id: e005e6fb55 [formerly 60dd115d66]
Former-commit-id: 33a649c9de
 2014-03-10 12:49:27 -05:00
Lee Venable
352f316313 Merge "Issue #2807. Added MalformedDataException for VAA decoding." into development 
Former-commit-id: 57d2e9737a [formerly f9d019f0dc] [formerly 57d2e9737a [formerly f9d019f0dc] [formerly 9bf99b9359 [formerly 4094bd9c9eb40db9a93e679bb09fba1bea1d8639]]]
Former-commit-id: 9bf99b9359
Former-commit-id: 20efe51651 [formerly 9e9bb11b5f]
Former-commit-id: 5cbb297cad
 2014-03-10 11:52:25 -05:00
Nate Jensen
00b39d0a56 Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development 
Former-commit-id: 60bff5c4af [formerly 4c7bda09c0] [formerly 60bff5c4af [formerly 4c7bda09c0] [formerly 33d1e94c38 [formerly 99c2f252cab0901cedfefa5e2a6d6799f7e29db8]]]
Former-commit-id: 33d1e94c38
Former-commit-id: ee1efad5d7 [formerly f045d2fab0]
Former-commit-id: decd1ed31f
 2014-03-10 11:36:16 -05:00
Slav Korolev
b3ce03a711 Issue #2807. Added MalformedDataException for VAA decoding. 
Former-commit-id: 4a3a56abe6 [formerly 8391b1098e] [formerly 4a3a56abe6 [formerly 8391b1098e] [formerly 8f8a6cb90e [formerly 085c10211b1fa397ca54b8d4d316055f9225db0c]]]
Former-commit-id: 8f8a6cb90e
Former-commit-id: d1fbf15b5d [formerly 1f8d00e033]
Former-commit-id: 6d08fd95d4
 2014-03-10 12:31:57 -04:00
Nate Jensen
6bafc51abe Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: 5a88f31a2b [formerly 6a75fe686a] [formerly 5a88f31a2b [formerly 6a75fe686a] [formerly d599db4af2 [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]
Former-commit-id: d599db4af2
Former-commit-id: 39aa26c2b6 [formerly 5094008bea]
Former-commit-id: 19a0cfb972
 2014-03-10 10:03:02 -05:00
Nate Jensen
6f1981102d Merge "Issue #2876 - move NDM plugin feature entry." into development 
Former-commit-id: 9026f93f20 [formerly c247535b96] [formerly 9026f93f20 [formerly c247535b96] [formerly 14e4807c02 [formerly 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88]]]
Former-commit-id: 14e4807c02
Former-commit-id: 3a66c42d37 [formerly 9dac73c948]
Former-commit-id: ea372042a5
 2014-03-10 09:49:28 -05:00
Mike Duff
f46a80e936 Issue #2876 - move NDM plugin feature entry. 
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f

Former-commit-id: bcd4b1490d [formerly 6be6181108] [formerly bcd4b1490d [formerly 6be6181108] [formerly 2fc712e1e8 [formerly a3b334c9269a9753af0f2dd9f6507aef23177b9f]]]
Former-commit-id: 2fc712e1e8
Former-commit-id: 1eefba01ab [formerly 861013ad86]
Former-commit-id: 75218fb1aa
 2014-03-10 09:45:04 -05:00
Nate Jensen
66180a8e05 Merge "Issue #2751 ensured that room admins know real userids" into development 
Former-commit-id: 1306957f2a [formerly e787cac9af] [formerly 1306957f2a [formerly e787cac9af] [formerly e963c7c4a1 [formerly e6feac94800c2dd82afcf42ca9f387b24514deff]]]
Former-commit-id: e963c7c4a1
Former-commit-id: ede24100b6 [formerly 4dd4805e33]
Former-commit-id: 3e61d24967
 2014-03-10 09:15:39 -05:00
Nate Jensen
358658d1af Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development 
Former-commit-id: bedb7b7653 [formerly f5a08f1f86] [formerly bedb7b7653 [formerly f5a08f1f86] [formerly d04751a986 [formerly 24492229a0bddc3db1b6945fcd2a89a486f1ef2e]]]
Former-commit-id: d04751a986
Former-commit-id: c5555eaa0c [formerly 9c5f87dc03]
Former-commit-id: bf58ef25b0
 2014-03-10 09:04:51 -05:00
Ben Steffensmeier
ad4ce67e85 Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter. 
Former-commit-id: c0b478eb97 [formerly 9122b6da99] [formerly c0b478eb97 [formerly 9122b6da99] [formerly 8650074737 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]
Former-commit-id: 8650074737
Former-commit-id: 5e4c35e93f [formerly d3043fda5a]
Former-commit-id: a1ac082c94
 2014-03-07 18:15:32 -06:00
Steve Harris
ed7921643c Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 51b755a476 [formerly 873bd6b889] [formerly 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: c24108e75b [formerly 708485427e]
Former-commit-id: 61af779433
 2014-03-07 15:43:40 -06:00
Mike Duff
958290f64a Issue #2876 - Fix manifest file. 
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9

Former-commit-id: 6ace7b364d [formerly 618dbec585] [formerly 6ace7b364d [formerly 618dbec585] [formerly 4cefac4658 [formerly 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48]]]
Former-commit-id: 4cefac4658
Former-commit-id: 1d2fd0a6d2 [formerly 9051daf05f]
Former-commit-id: b818ea8d29
 2014-03-07 15:41:24 -06:00
Brian Clements
975bfca460 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: 2afc1a9319 [formerly 44d161729f] [formerly 2afc1a9319 [formerly 44d161729f] [formerly dc94769c14 [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]
Former-commit-id: dc94769c14
Former-commit-id: acb20cfbbe [formerly ac63129ad1]
Former-commit-id: 6590587d9e
 2014-03-07 15:37:29 -06:00
Steve Harris
e29b96b6bd Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 068297b90a [formerly 92232fa063] [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: 4d1fbf8743 [formerly f992a6b046]
Former-commit-id: ea01373320
 2014-03-07 15:16:18 -06:00
Richard Peter
a44a6fbe4c Merge "Issue #2876 - Pluginize NDM review comments" into development 
Former-commit-id: 946c8fcf24 [formerly 4568108a3c] [formerly 946c8fcf24 [formerly 4568108a3c] [formerly c9dfa75d1c [formerly 296f8f835cbc87783f0f50278d2148f756cf6296]]]
Former-commit-id: c9dfa75d1c
Former-commit-id: 6845ca74b3 [formerly 29250be003]
Former-commit-id: 338f27beac
 2014-03-07 13:04:14 -06:00
Mike Duff
8c8a5f739f Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 7fd9cc40c7 [formerly 944fca16b8] [formerly 7fd9cc40c7 [formerly 944fca16b8] [formerly c388cb839b [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]]
Former-commit-id: c388cb839b
Former-commit-id: 12ea05cffc [formerly 7bb9ada00d]
Former-commit-id: efbc53e61f
 2014-03-07 12:47:46 -06:00
Brian.Dyke
d9f1b98ce7 Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 48cc3b6c55 [formerly 3ac2a61218] [formerly 48cc3b6c55 [formerly 3ac2a61218] [formerly 1fe5504d4c [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 48f1f544d6 [formerly 0c4b9469b0]
Former-commit-id: 795c5424cb
 2014-03-07 11:50:06 -05:00
Brian.Dyke
ac07a4fc49 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: a0e3f08fce [formerly 394076196b] [formerly a0e3f08fce [formerly 394076196b] [formerly 7b798ab5d2 [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: fa189c0ef6 [formerly 6ced1bedc2]
Former-commit-id: c8b3730fef
 2014-03-07 09:01:09 -05:00
Brian.Dyke
da36dde938 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: 0bbf137b05 [formerly 312cd8a3e8] [formerly 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 2eec413d72 [formerly 2f94480121]
Former-commit-id: 8f2271403d
 2014-03-07 08:57:07 -05:00
Brian.Dyke
c1dab50ce0 14.1.1-22 baseline 
Former-commit-id: fe30e1d545 [formerly 21f17d4f9b] [formerly fe30e1d545 [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 9406a1d6c0 [formerly a4c136fd60]
Former-commit-id: 067802b104
 2014-03-07 08:49:00 -05:00
Steve Harris
d65c768373 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: dc7d6ceced [formerly 8b6263bfbd] [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: 1c64a5c025
Former-commit-id: 972fa3bee6 [formerly 7fbbc1e118]
Former-commit-id: 7f932399b9
 2014-03-06 18:31:10 -06:00
Steve Harris
71c8e15b78 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 3358e8d6ef [formerly 7f1ad89df9] [formerly 3358e8d6ef [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 2371a74a29 [formerly 8ec20fc5e9]
Former-commit-id: 104b3d369a
 2014-03-06 18:19:55 -06:00
Nate Jensen
45ff104294 Issue #2826 fix collaboration mosaic image disposed issue 
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: d9af17287d [formerly 7fa8bf636f] [formerly d9af17287d [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: cb81644412 [formerly 04d7ef0e7a]
Former-commit-id: 69bdf2bd60
 2014-03-06 18:07:40 -06:00
Brad Gonzales
c50ea20d9e Issue #2885 Updated java version in build.properties.p2. 
Change-Id: Ifb266696902142ab59977025ae75010540836ed5

Former-commit-id: dadcd2e10b [formerly 2e224094ad] [formerly dadcd2e10b [formerly 2e224094ad] [formerly b47dc5df40 [formerly d1f3c5e508cf268198531a31fd3a91faba0159df]]]
Former-commit-id: b47dc5df40
Former-commit-id: 574f6f8d92 [formerly 66386f340a]
Former-commit-id: 7b3b48d9b3
 2014-03-06 17:35:43 -06:00