Commit graph

6875 commits

Author SHA1 Message Date
Chip Gobs
cbbe589afe Merge "VLab Issue #4612 Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when performing quality code operations in MPE in GroupEdit Mode." into ohd_14.3.1
Former-commit-id: 83e0a41593 [formerly bbc346e29e] [formerly 83e0a41593 [formerly bbc346e29e] [formerly ec3ff24577 [formerly 3ad2b50520a7a8fdfaa1a99a1f34570e43d0164e]]]
Former-commit-id: ec3ff24577
Former-commit-id: 1af9261db2 [formerly 272690ed5a]
Former-commit-id: d0810673a4
2014-09-08 14:29:28 -04:00
Chip Gobs
c4cbdb87dd Merge "VLab Issue #4611 Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved, instead of redisplaying after the ColorScaleManager is closed." into ohd_14.3.1
Former-commit-id: 117a5daab1 [formerly 02038fd474] [formerly 117a5daab1 [formerly 02038fd474] [formerly 155c06ddae [formerly b526634078fbe20a471ae40f281299eb7f426208]]]
Former-commit-id: 155c06ddae
Former-commit-id: 0b6a91596c [formerly 180f6d67ba]
Former-commit-id: 7c15a16999
2014-09-08 14:29:08 -04:00
Chip Gobs
e37cf3ecf7 Merge "VLab Issue #4602 Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699" into ohd_14.3.1
Former-commit-id: bc2962c9ce [formerly 780f484a56] [formerly bc2962c9ce [formerly 780f484a56] [formerly cf0816edce [formerly 57614e9869d5a36c80b8d988e8fea4136045a982]]]
Former-commit-id: cf0816edce
Former-commit-id: b41aef6d84 [formerly edef86ba43]
Former-commit-id: d00048b40f
2014-09-08 14:28:33 -04:00
Brian Clements
cb37ddfd9d Omaha #3518 each JVM gets a unique user prefs folder
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619

Former-commit-id: e95a139900 [formerly 2c1cd559b6] [formerly e95a139900 [formerly 2c1cd559b6] [formerly a0d663530b [formerly 856b223352b99e3f96df6dab84aea313885b3c37]]]
Former-commit-id: a0d663530b
Former-commit-id: 7938c547e8 [formerly b3d6dbad76]
Former-commit-id: 7397b4c453
2014-09-08 13:16:13 -05:00
Chip Gobs
07ce013d2c VLab Issue #4612
Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when
performing quality code operations in MPE in GroupEdit Mode.

Change-Id: Ib8da13cfa2085aeb6efba96e7a1789912534bddd

Former-commit-id: a06a4667a3 [formerly f7624b0609] [formerly a06a4667a3 [formerly f7624b0609] [formerly 874db74c54 [formerly 7df28e4d5c1d8a03db5500939b0af2905d11a4aa]]]
Former-commit-id: 874db74c54
Former-commit-id: 7bda177305 [formerly ee70ab2956]
Former-commit-id: b2319cd60a
2014-09-08 12:37:20 -04:00
Nathan Bowler
ff66970808 Omaha #3405 Convert airep and pirep to DAF. Extract common code. Update acars to use common
Change-Id: I09fd0119900dabbde901773469d90b31eda57d63

Former-commit-id: ebe27b736f [formerly ee5d7fc5e5] [formerly ebe27b736f [formerly ee5d7fc5e5] [formerly 099f40fb87 [formerly 4c32ce907e8bad06015688ca5596a23bfb655463]]]
Former-commit-id: 099f40fb87
Former-commit-id: bcfdc408d4 [formerly ac6f4dea5a]
Former-commit-id: 7af3b8b174
2014-09-08 12:36:48 -04:00
Chip Gobs
59d8ddc6c4 VLab Issue #4611
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of redisplaying after the ColorScaleManager is closed.

Change-Id: I0156612302853141392c263eab8b54a16c3be7a3

Former-commit-id: 3c350e52d2 [formerly 5573a077bf] [formerly 3c350e52d2 [formerly 5573a077bf] [formerly 31d32a2e82 [formerly 6fe0cf5e013896af2e3380a9f93168e8fa66068b]]]
Former-commit-id: 31d32a2e82
Former-commit-id: a06dee5dd3 [formerly d6ede1b6a6]
Former-commit-id: b4fab70dc1
2014-09-08 12:26:04 -04:00
Chip Gobs
b2f957c4d4 VLab Issue #4611
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of after the ColorScaleManager is closed.

Change-Id: I0156612302853141392c263eab8b54a16c3be7a3

Former-commit-id: 69450976c8 [formerly 8c6e70ccab] [formerly 69450976c8 [formerly 8c6e70ccab] [formerly 25e4ed8d51 [formerly 44f6bf08a72b5450d6d0db40ff49dd5123cf811c]]]
Former-commit-id: 25e4ed8d51
Former-commit-id: 689ccd9fcf [formerly 215f1dfaa1]
Former-commit-id: 9bf30e3dbd
2014-09-08 12:06:45 -04:00
Chip Gobs
3e23c79eea VLab Issue #4602
Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699

Change-Id: I12b879fb873f66d43d7f735165fa4f303c026174

Former-commit-id: da10a7b4ac [formerly fc8a7d48ca] [formerly da10a7b4ac [formerly fc8a7d48ca] [formerly 4911ac1917 [formerly 4d87ebeef93e561a303566853fd2616316c568ca]]]
Former-commit-id: 4911ac1917
Former-commit-id: 6d5926df35 [formerly 7c6f9b3ad9]
Former-commit-id: f50b09855f
2014-09-08 11:44:48 -04:00
Brian Clements
f4fa010292 Omaha #2926 switched text subscription to thrift client
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6

Former-commit-id: d8b2da2900 [formerly ac811b666c] [formerly d8b2da2900 [formerly ac811b666c] [formerly 0087580736 [formerly 410ef2954d6cfff11a4718056983ccaecf186fd3]]]
Former-commit-id: 0087580736
Former-commit-id: d7a388cfd9 [formerly 375c3a6f78]
Former-commit-id: 11974d9809
2014-09-05 16:52:38 -05:00
Brian Clements
a5e8e94411 Omaha #2926 moved TextDBRequest to common
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c

Former-commit-id: c89a74943e [formerly 1b248efb54] [formerly c89a74943e [formerly 1b248efb54] [formerly c77b4f4e8b [formerly 924e512c327c838d866b353ec8da8f7e5534db49]]]
Former-commit-id: c77b4f4e8b
Former-commit-id: 8cc7d1e36d [formerly 3a0da3d8d5]
Former-commit-id: 4640945dc7
2014-09-05 12:56:04 -05:00
Baoyu Yin
f7d802799f VLab Issue #4624 - AWIPS2_DR_17545 Volume Browser MMP units are wrong ; fixes #4624
Change-Id: I407cf142f9adfc7601b14e12e33223cf344b596c

Former-commit-id: 11f1e39b07 [formerly 2c4a9fbe7c] [formerly 11f1e39b07 [formerly 2c4a9fbe7c] [formerly 7f317934ac [formerly 0eb76fb764113196683d8ae771d7cf37ccc86495]]]
Former-commit-id: 7f317934ac
Former-commit-id: 5aa9d0601a [formerly bca9556bd2]
Former-commit-id: dc075b1dfe
2014-09-05 13:35:07 -04:00
Baoyu Yin
7ee5c5a36c VLab Issue #4623 - AWIPS2_DR_17363 LAPS freezing level height not computed prevents display of hail product; fixes #4623
Change-Id: I3b608e9024dbe70e08a549b5469c2fb09e448a9a

Former-commit-id: db7c16b305 [formerly 3e39cd9bb5] [formerly db7c16b305 [formerly 3e39cd9bb5] [formerly 7008216976 [formerly 61838d538f73adb6279ba55d5fe3c5b02d3a28f4]]]
Former-commit-id: 7008216976
Former-commit-id: aaffd08d53 [formerly 340e242ee8]
Former-commit-id: b1d682a92e
2014-09-05 11:18:54 -04:00
Chris Cody
97d6b67891 Omaha #3365 Removing and realigning AWIPS2 Baseline tests
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48

Former-commit-id: 39887a4b9c [formerly f4445d24cd] [formerly 39887a4b9c [formerly f4445d24cd] [formerly 9e823a47d6 [formerly 97000cc70e8d826b3e8828a1731278673e0ac635]]]
Former-commit-id: 9e823a47d6
Former-commit-id: 62780e001b [formerly 57c689eee6]
Former-commit-id: 0564fa8bf9
2014-09-05 10:14:14 -05:00
Brian.Dyke
9f0254ee22 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 4220590613 [formerly 9e1ee22146] [formerly 4220590613 [formerly 9e1ee22146] [formerly 702dd65aa7 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]]
Former-commit-id: 702dd65aa7
Former-commit-id: 901ed0dca8 [formerly ebf9ad1299]
Former-commit-id: c868172449
2014-09-05 11:13:12 -04:00
Brian.Dyke
ea20efaf55 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: cdd1e08ee3 [formerly d7407481ef] [formerly cdd1e08ee3 [formerly d7407481ef] [formerly 9f7fabb002 [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]]
Former-commit-id: 9f7fabb002
Former-commit-id: 8a3f7aa5d9 [formerly 6f4bdae843]
Former-commit-id: 86e748a02e
2014-09-05 10:57:14 -04:00
Baoyu Yin
ca85c05530 VLab Issue #4613 - AWIPS2_DR_14755 Thin Client synchronize misspelled ; fixes #4613
Change-Id: I5cf6380bd73f500298d6b1644238abc4d51efdef

Former-commit-id: 0ac99fce21 [formerly dc58405bf6] [formerly 0ac99fce21 [formerly dc58405bf6] [formerly ebe548d860 [formerly b5ec42cbbc7c064098075e347b90e4f22045f66d]]]
Former-commit-id: ebe548d860
Former-commit-id: 246e34403d [formerly 9432625cba]
Former-commit-id: fa32be88c0
2014-09-05 10:37:27 -04:00
Baoyu Yin
fd793f2514 VLab Issue #4609 - AWIPS2_DR_15762 Spelling error Upper Air Menu - Tallahassee ; fixes #4609
Change-Id: Iab5a67594a0fe20e5e7326e3f25ae426326f1ab3

Former-commit-id: 8c7954d245 [formerly 15de59d02f] [formerly 8c7954d245 [formerly 15de59d02f] [formerly d6e2e21683 [formerly 5c311cc979052e214129f77150daad2cdfbd17fc]]]
Former-commit-id: d6e2e21683
Former-commit-id: 25263c3a9d [formerly 1e806ca6a1]
Former-commit-id: af4c4cd610
2014-09-05 10:21:32 -04:00
Ana Rivera
9d16e16770 VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152

Former-commit-id: c77e5412a6 [formerly 6d48576930] [formerly c77e5412a6 [formerly 6d48576930] [formerly a8b04b8e63 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]]
Former-commit-id: a8b04b8e63
Former-commit-id: f5695a423d [formerly ac4f61813f]
Former-commit-id: 3e1039b714
2014-09-05 13:27:29 +00:00
Brian.Dyke
116aa56b02 Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: 15381f5e9f [formerly 7b7ef56b04] [formerly 15381f5e9f [formerly 7b7ef56b04] [formerly a610fe6475 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]]
Former-commit-id: a610fe6475
Former-commit-id: f3b51b9187 [formerly e64fe3875e]
Former-commit-id: a8f49dd627
2014-09-04 15:59:00 -04:00
Nate Jensen
064d75be69 Merge "Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times" into omaha_14.4.1
Former-commit-id: 2f0554097a [formerly 51d910af00] [formerly 2f0554097a [formerly 51d910af00] [formerly cf41d7e3a3 [formerly 03fc1d04092135970a6c7089bcbbf11d5c584dd1]]]
Former-commit-id: cf41d7e3a3
Former-commit-id: 3ae925ce87 [formerly 96b3c08bd1]
Former-commit-id: 165b5fd49b
2014-09-04 13:49:36 -05:00
Nate Jensen
e89d0a9aad Merge "Omaha #3356 remove unnecessary register buddy to uf.viz.core" into omaha_14.4.1
Former-commit-id: f8d2bbd89a [formerly c17f5039b3] [formerly f8d2bbd89a [formerly c17f5039b3] [formerly 6c89507d2f [formerly ae78c2f59d47eb83d8693676362aaf099dbbe35b]]]
Former-commit-id: 6c89507d2f
Former-commit-id: 667bda47a8 [formerly 8277e2cd1f]
Former-commit-id: 65d06e808e
2014-09-04 13:48:39 -05:00
Nate Jensen
8d779e79d3 Merge "Omaha #3545 - Add log and fail message when directories are missing" into omaha_14.4.1
Former-commit-id: 755dd0c97e [formerly 7a5eeb427c] [formerly 755dd0c97e [formerly 7a5eeb427c] [formerly 1cd7ec9ac7 [formerly 40448419702642f0e7b85dbe031b091e43e9ee88]]]
Former-commit-id: 1cd7ec9ac7
Former-commit-id: d4359bb64a [formerly 326185ad9c]
Former-commit-id: cdb4604072
2014-09-04 13:24:29 -05:00
Brian.Dyke
d6ef2b6737 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: c586c26447 [formerly e762271240] [formerly c586c26447 [formerly e762271240] [formerly e5227e90de [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]]
Former-commit-id: e5227e90de
Former-commit-id: 1ee7743b8b [formerly c48196cd33]
Former-commit-id: 108d0bfc77
2014-09-04 14:18:34 -04:00
Qinglu.Lin
ec9b3fa971 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110

Former-commit-id: 62bcefb9e1 [formerly 8c28597210] [formerly 62bcefb9e1 [formerly 8c28597210] [formerly 902b6c55bd [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]]
Former-commit-id: 902b6c55bd
Former-commit-id: 920b6bb53b [formerly 9c67b89df7]
Former-commit-id: c746dbabad
2014-09-04 14:09:24 -04:00
Brian.Dyke
06a516d948 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 2b613a26fd [formerly 72e2882496] [formerly 2b613a26fd [formerly 72e2882496] [formerly 9e94c2c571 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]]]
Former-commit-id: 9e94c2c571
Former-commit-id: 6d69d0678c [formerly 5a1fa755f9]
Former-commit-id: 1c871eaf3d
2014-09-04 14:01:26 -04:00
Greg Armendariz
98c50cb61e Omaha #3545 - Add log and fail message when directories are missing
Former-commit-id: e8a75882ee [formerly 0a988d64e4] [formerly e8a75882ee [formerly 0a988d64e4] [formerly a5359e4547 [formerly 05d45b0c005ce7c8cca51c367754e7e6bca6c085]]]
Former-commit-id: a5359e4547
Former-commit-id: b7535cb9ac [formerly e658278545]
Former-commit-id: 08b5040650
2014-09-04 11:52:13 -05:00
Nathan Bowler
6d5bf0a035 Omaha #3405 Adding unaltered, original airep and pirep scripts
Change-Id: I9daefa1c0c905b2022d7ad891a9983fb831c5ac3

Former-commit-id: d7d3a3d119 [formerly 0a6cd0db2d] [formerly d7d3a3d119 [formerly 0a6cd0db2d] [formerly b1b0760a8c [formerly 4a47a2053311ebc5ae4a5ad540c985c7a24ea4f3]]]
Former-commit-id: b1b0760a8c
Former-commit-id: 3e7a32b146 [formerly 8684ea7447]
Former-commit-id: 3e0ea8f7ff
2014-09-04 12:27:40 -04:00
Nate Jensen
680fa77b9d Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: a1bccdc57f [formerly 2cfbfc1dc4] [formerly a1bccdc57f [formerly 2cfbfc1dc4] [formerly 87d507313b [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]]
Former-commit-id: 87d507313b
Former-commit-id: 6d47c3c987 [formerly b1619c055a]
Former-commit-id: 0e6c455b42
2014-09-04 10:10:37 -05:00
Baoyu Yin
6a427f968c VLab Issue #4608 - AWIPS2_DR_16259 Minor Typo in Volume Menu of D2D 4-PanelFamilies ; fixes #4608
Change-Id: I73a3f5a441e33dffe3dc7f3962c3fceec930ce3a

Former-commit-id: 5ad996e60e [formerly 9e110936e8] [formerly 5ad996e60e [formerly 9e110936e8] [formerly 73f7935f46 [formerly cb4e2e652ba3763725b8ec7e6d528748d2472a6b]]]
Former-commit-id: 73f7935f46
Former-commit-id: 83de62e506 [formerly 17268bb5dd]
Former-commit-id: 8a9ec04c80
2014-09-04 08:23:53 -04:00
Baoyu Yin
3ce032aa35 VLab Issue #4567 - AWIPS2_DR_16933: Text Script Editor Edit Menu Delete Line Option; fixes #4567
Change-Id: I10e1dbdd6352adcfa39ae8980230a95afdc8cec1

Former-commit-id: 7f80279179 [formerly fd229c716d] [formerly 7f80279179 [formerly fd229c716d] [formerly 309e1bc684 [formerly d9f69c85c6432a937f70c16053f45d5214ce5147]]]
Former-commit-id: 309e1bc684
Former-commit-id: cbd1062ca8 [formerly ba01db8d69]
Former-commit-id: beb0b09e77
2014-09-04 07:53:38 -04:00
Brian.Dyke
fcb029505a Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: fa6b302ab6 [formerly 043a95d35e] [formerly fa6b302ab6 [formerly 043a95d35e] [formerly d695dd0084 [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]]
Former-commit-id: d695dd0084
Former-commit-id: 947d137798 [formerly 62a70ef5ca]
Former-commit-id: fff0709c92
2014-09-03 21:14:27 -04:00
Brian.Dyke
7bc9c15a9e ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 3ddb5831a0 [formerly 121a2d100f] [formerly 3ddb5831a0 [formerly 121a2d100f] [formerly cfe03adff6 [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]]
Former-commit-id: cfe03adff6
Former-commit-id: 50858cac9f [formerly e8a85da57a]
Former-commit-id: 7f1e3b0ead
2014-09-03 21:10:16 -04:00
Nate Jensen
6140da7ee6 Merge "Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way" into omaha_14.4.1
Former-commit-id: d977dbfcb0 [formerly 1fd0ed2de6] [formerly d977dbfcb0 [formerly 1fd0ed2de6] [formerly 3a2558eac8 [formerly fbc9b64a0c0734e46ec9db10e0760aa8f2b27c24]]]
Former-commit-id: 3a2558eac8
Former-commit-id: 2781d227f3 [formerly bb8918e96b]
Former-commit-id: 577e3341f6
2014-09-03 17:13:06 -05:00
Nate Jensen
364295639c Omaha #3356 remove unnecessary register buddy to uf.viz.core
Change-Id: I95915b6f1d458a5bb581eec79d40af8bc94122f4

Former-commit-id: 0967e25c67 [formerly 20251fc3e3] [formerly 0967e25c67 [formerly 20251fc3e3] [formerly b332434b49 [formerly a46d5914ae58ad1c3410cdf8d7e67cf856e4c2bd]]]
Former-commit-id: b332434b49
Former-commit-id: ccb7d4a797 [formerly 6285cc9893]
Former-commit-id: 9e1336de40
2014-09-03 16:10:53 -05:00
Steve Harris
67969a5118 Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 0ea6b72088 [formerly 0e869fa6c1] [formerly 0ea6b72088 [formerly 0e869fa6c1] [formerly afa45bf919 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]]
Former-commit-id: afa45bf919
Former-commit-id: 550eb6e3ac [formerly e3d99832ec]
Former-commit-id: 49a48c4874
2014-09-03 15:22:00 -05:00
Matt Nash
667ce84a62 Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way
Former-commit-id: 90b0619656 [formerly 118d811eee] [formerly 90b0619656 [formerly 118d811eee] [formerly 980d7bf5ad [formerly dd691896f03ba16d683a284a26b8ef923e364834]]]
Former-commit-id: 980d7bf5ad
Former-commit-id: 23d1a555a7 [formerly bce9e0595c]
Former-commit-id: a1ea03c29b
2014-09-03 14:11:15 -05:00
Chip Gobs
589a94588d Merge remote-tracking branch 'origin/master_14.3.1' into ohd_14.3.1_v6
Former-commit-id: bc743b7bd7 [formerly 0278dfb45f] [formerly bc743b7bd7 [formerly 0278dfb45f] [formerly 51f2d9df8e [formerly 2131a59fecbb9bc01dd395360f7f8dafe6d76b0b]]]
Former-commit-id: 51f2d9df8e
Former-commit-id: ab57f9a631 [formerly 4ca70c7f7e]
Former-commit-id: fba687dab4
2014-09-03 14:48:29 -04:00
Nate Jensen
3188cd0af2 Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13

Former-commit-id: 2c74d90cc4 [formerly c0dab26b92] [formerly 2c74d90cc4 [formerly c0dab26b92] [formerly 9d462e1dd9 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]]
Former-commit-id: 9d462e1dd9
Former-commit-id: d5e948b7e2 [formerly 05a73b1e4b]
Former-commit-id: d87cfb8131
2014-09-03 11:34:10 -05:00
Nate Jensen
64c23a487d Omaha #3356 remove unnecessary dependency
Change-Id: I59503f01e8c7ec451c7dcb725bf9fecd0209fba2

Former-commit-id: a7984f6dde [formerly 4b5d5ab6cc] [formerly a7984f6dde [formerly 4b5d5ab6cc] [formerly 362fee1984 [formerly c60ca3a16e348216c582f30bc95d8d35ef81e312]]]
Former-commit-id: 362fee1984
Former-commit-id: 9e5c92de45 [formerly de4472f76b]
Former-commit-id: 5a2a700085
2014-09-03 10:53:30 -05:00
Nate Jensen
4d031466de Merge "Omaha #3356 remove OBE register buddies from collaboration" into omaha_14.4.1
Former-commit-id: 8bb8625edf [formerly 2a097da5c2] [formerly 8bb8625edf [formerly 2a097da5c2] [formerly 0de385006d [formerly 91942c044f4c4462a2a76192047c40448754c2ec]]]
Former-commit-id: 0de385006d
Former-commit-id: acb9909b35 [formerly c6a5a6145e]
Former-commit-id: f1d071ad10
2014-09-03 10:50:02 -05:00
Nate Jensen
22fa9cc6d9 Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: b690c360ac [formerly 8e74892cd6] [formerly b690c360ac [formerly 8e74892cd6] [formerly 40d4abe4cd [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]]
Former-commit-id: 40d4abe4cd
Former-commit-id: f78e7fe79c [formerly 5b2e410c6c]
Former-commit-id: 54e9b04c3d
2014-09-03 10:00:11 -05:00
Chris Cody
cfc713d6ea Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline
Conflicts:
	tests/unit/com/raytheon/uf/common/serialization/comm/RequestRouterTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/request/ServerPrivilegedRequestHandlerTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/router/RemoteServerRequestRouterTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/router/ServerRequestRouterTest.java

Change-Id: Ib1cec696e6c31b4a3292174a3557fe72b86ce4ff

Former-commit-id: 13bc309688 [formerly 005c0c0b10] [formerly 13bc309688 [formerly 005c0c0b10] [formerly 7dfcf245bf [formerly 5161931ed5438b78a936f204a588a742c9768f8a]]]
Former-commit-id: 7dfcf245bf
Former-commit-id: 58b663b788 [formerly 41c12afc1d]
Former-commit-id: 7cb8e16a5e
2014-09-03 09:54:46 -05:00
Chris Cody
c2ff252400 Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline.
Conflicts:
	tests/.classpath

Change-Id: I0014762b034e95b1bb8a6d37a18ef7445873994c

Former-commit-id: 91fde6ab60 [formerly f8faec0526] [formerly 91fde6ab60 [formerly f8faec0526] [formerly 529377618f [formerly 07aa4794d04cb31e7c6020d792d45d0afb951268]]]
Former-commit-id: 529377618f
Former-commit-id: 8e340e4b05 [formerly 3fc1103d07]
Former-commit-id: f025c02ec6
2014-09-03 09:50:50 -05:00
Richard Peter
9991229ab4 Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: 1c05f1b459 [formerly 3de26efce6] [formerly 1c05f1b459 [formerly 3de26efce6] [formerly af87813ea9 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]]]
Former-commit-id: af87813ea9
Former-commit-id: 1277318360 [formerly ad59d54110]
Former-commit-id: 70e9fd7859
2014-09-03 09:42:34 -05:00
Nate Jensen
8248f2f5ab Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
Former-commit-id: a0830d06d5 [formerly 5b80aadbac] [formerly a0830d06d5 [formerly 5b80aadbac] [formerly 80cc58cf25 [formerly e393e1f0455d466edde925608b6f0f1e35351141]]]
Former-commit-id: 80cc58cf25
Former-commit-id: 8e6f1c0b05 [formerly db8517a576]
Former-commit-id: d717f13039
2014-09-03 09:21:28 -05:00
Nate Jensen
ea4fd384ca Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: a690b853bb [formerly 0f35426ad0] [formerly a690b853bb [formerly 0f35426ad0] [formerly c23071f48c [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]]]
Former-commit-id: c23071f48c
Former-commit-id: e5f28ab1f9 [formerly d9d0068a1c]
Former-commit-id: fd931efdf2
2014-09-02 17:34:59 -05:00
Mark Peters
72184dbcaf Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032

Former-commit-id: 447986eed3 [formerly 06b98bb48a] [formerly 447986eed3 [formerly 06b98bb48a] [formerly ee36d09cb0 [formerly 725354074d54112c8658dc34a8ac564739acbebb]]]
Former-commit-id: ee36d09cb0
Former-commit-id: 8ace5b852c [formerly a3feb0de78]
Former-commit-id: e7e58b4e78
2014-09-02 16:31:44 -05:00
Ben Steffensmeier
5b35e526f4 Omaha #3390 Remove references to deprecated API.
Former-commit-id: 950075dc59 [formerly 1d2144e840] [formerly 950075dc59 [formerly 1d2144e840] [formerly e32037b42a [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]
Former-commit-id: e32037b42a
Former-commit-id: 068653ac95 [formerly b77166c26e]
Former-commit-id: 6e1981d6f6
2014-09-02 15:39:45 -05:00
Brian.Dyke
e8143081cb Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: 9e156775e5 [formerly fd8ad016ef] [formerly 9e156775e5 [formerly fd8ad016ef] [formerly 14e64881a1 [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]]
Former-commit-id: 14e64881a1
Former-commit-id: 75fccb7361 [formerly 43c9dfa397]
Former-commit-id: 2d9a8a8b40
2014-09-02 16:32:54 -04:00