Commit graph

3591 commits

Author SHA1 Message Date
Ben Steffensmeier
cfe82040a1 Omaha #3390 Fix alertviz build.
Former-commit-id: cfd1ba5911 [formerly d8e305fecc] [formerly cfd1ba5911 [formerly d8e305fecc] [formerly b5e91a6547 [formerly b1d0566f20359b0ffcc1ccd8f6a7469f8c7db0e9]]]
Former-commit-id: b5e91a6547
Former-commit-id: a282c066f7 [formerly 3f704bf8ea]
Former-commit-id: 2162133298
2014-07-23 14:18:22 -05:00
Zhidong.Hao
2a4ea1243c ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing
Change-Id: I1a4fb9be1253b4655bd43674aab4a4ddcf6d0ce7

Former-commit-id: d7cce22d02 [formerly 26c4bb2414] [formerly d7cce22d02 [formerly 26c4bb2414] [formerly a3cda853cf [formerly 192948e00538bcf0dfc0aaf20ea1dcb216313ffb]]]
Former-commit-id: a3cda853cf
Former-commit-id: ee2f893d21 [formerly eef5191d1c]
Former-commit-id: 350028e069
2014-07-23 14:37:28 -04:00
Steve Harris
a980faab73 Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
Former-commit-id: 619ed933ac [formerly eaa4456fa7] [formerly 619ed933ac [formerly eaa4456fa7] [formerly 35130cb3f5 [formerly 2c17b02a196584edbaa2cef33d8e9adc91567f8e]]]
Former-commit-id: 35130cb3f5
Former-commit-id: ab6fad008f [formerly 0da15f729e]
Former-commit-id: 9b3af6a2dd
2014-07-23 13:07:11 -05:00
Jonathan Sanchez
e4268f814e Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1

Former-commit-id: 997485dd22 [formerly 86a8ca4a30] [formerly 997485dd22 [formerly 86a8ca4a30] [formerly b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]
Former-commit-id: b991838494
Former-commit-id: f7bc9a8023 [formerly 025c29acc0]
Former-commit-id: 56cbd23141
2014-07-22 15:32:12 -05:00
Mark Peters
0a1e272abb Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin
Change-Id: I222f99b0b952d9cef91208eb27f6adca43e13669

Former-commit-id: 85bf675f6a [formerly 92b1e9a9cf] [formerly 85bf675f6a [formerly 92b1e9a9cf] [formerly 29bc0fae50 [formerly 7929e5b809d83a0f682e9f1c6953c9a090ed7310]]]
Former-commit-id: 29bc0fae50
Former-commit-id: 034616b4b7 [formerly 6727654e2d]
Former-commit-id: a87ed6f7af
2014-07-22 14:57:35 -05:00
Nate Jensen
42ada8c3ac Merge "Omaha #3422 Replace drawFilledCircle and drawArc calls" into omaha_14.4.1
Former-commit-id: d419c9b8ca [formerly 87ec4fed2c] [formerly d419c9b8ca [formerly 87ec4fed2c] [formerly 415c9e73fd [formerly eac41695224c18aa566e4b1fdcbaf48647d93fdf]]]
Former-commit-id: 415c9e73fd
Former-commit-id: d4a11f062e [formerly aeb224e2c7]
Former-commit-id: 41b01e96ac
2014-07-22 14:21:27 -05:00
Nate Jensen
6ec4a3c6df Merge "Omaha #3214 fixed typos in LightningFrameRetriever" into omaha_14.4.1
Former-commit-id: fd997ad030 [formerly 464e252e96] [formerly fd997ad030 [formerly 464e252e96] [formerly 3128374080 [formerly 5a2968189edd1abe58560404fc01dcea82957b5f]]]
Former-commit-id: 3128374080
Former-commit-id: 716f83ef2a [formerly cef2844dbc]
Former-commit-id: 78bf4db27e
2014-07-22 14:01:08 -05:00
Mark Peters
3a160929d5 Omaha #3422 Replace drawFilledCircle and drawArc calls
Change-Id: I2ecd1e2fd9614317addc248130bfc8ececc3d80e

Former-commit-id: f1b1aa1b5d [formerly 9532289be3] [formerly f1b1aa1b5d [formerly 9532289be3] [formerly b0e9c73eaf [formerly f0575e788549a1728c6d6fff7b99e3764c3739d8]]]
Former-commit-id: b0e9c73eaf
Former-commit-id: 9937dc0028 [formerly 4d7d9ec799]
Former-commit-id: 75e25d7710
2014-07-22 13:50:39 -05:00
Brian Clements
a2117edf9f Omaha #3333 grid lightning ignores strikes outside of map
Change-Id: I188aac28b50b7ac8a107d785b52471c1d7fe6d14

Former-commit-id: 0bd9bb7c21 [formerly a9284b35ff] [formerly 0bd9bb7c21 [formerly a9284b35ff] [formerly 62dcdda0bc [formerly bb55bde76765d330f782524965fe79d5373b6e9f]]]
Former-commit-id: 62dcdda0bc
Former-commit-id: b069785d53 [formerly 0deb06ba40]
Former-commit-id: 976404c8b7
2014-07-22 13:42:18 -05:00
Brian Clements
3c19ca5c17 Omaha #3214 fixed typos in LightningFrameRetriever
Change-Id: I1616b5f64c3d6c99f034c7f7c526a453e0f5578c

Former-commit-id: 319cbe37b3 [formerly 45d52c2298] [formerly 319cbe37b3 [formerly 45d52c2298] [formerly 3f82ead0b5 [formerly 7f5868947a0c7bee586908f832f3bb9030c3e84e]]]
Former-commit-id: 3f82ead0b5
Former-commit-id: acf2c60fd3 [formerly 02cf0078d4]
Former-commit-id: 43f5ee1032
2014-07-22 13:33:26 -05:00
Steve Harris
3b5fc91579 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 7b0b043c67 [formerly bce7039508] [formerly 7b0b043c67 [formerly bce7039508] [formerly 8a7ea92c2b [formerly c0033681d38af55bff79efbceec119606fcc5c2f]]]
Former-commit-id: 8a7ea92c2b
Former-commit-id: 7a4111b29f [formerly 0314663e95]
Former-commit-id: e24b5a2fec
2014-07-22 10:26:33 -05:00
Mark Peters
969c6a4685 Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: b5a25e7372 [formerly e638d2f41b] [formerly b5a25e7372 [formerly e638d2f41b] [formerly e4c455f5c0 [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 30a6e96d7c [formerly e48c2b7116]
Former-commit-id: 3aee17fbb5
2014-07-21 17:07:02 -05:00
Brian.Dyke
b77d938e42 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 9ef7783251 [formerly e55b892fc3] [formerly 9ef7783251 [formerly e55b892fc3] [formerly c26e0cd548 [formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]]]
Former-commit-id: c26e0cd548
Former-commit-id: efff77a72c [formerly a3618e103e]
Former-commit-id: 3e66c55f09
2014-07-21 11:18:25 -04:00
David Friedman
4bdc4d4297 ASM #15049 - LAPS time matching problem
Change-Id: I52eee87defb407b741208e183b9829558bfa6733

Former-commit-id: 6aebd3a19b [formerly ec25c44fe7] [formerly 6aebd3a19b [formerly ec25c44fe7] [formerly 188e25d2e7 [formerly 624c3a4225910863d5cc0b795493a39c0422a3e3]]]
Former-commit-id: 188e25d2e7
Former-commit-id: e73a125fd9 [formerly 93a57dafea]
Former-commit-id: 9efbcdf0b2
2014-07-18 17:06:05 +00:00
Nate Jensen
18439faeb9 Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
falling back to the base version

Change-Id: I2df669504061160c6ace76560f07845f99a80912

Former-commit-id: 82bef00378 [formerly da731be2f7] [formerly 82bef00378 [formerly da731be2f7] [formerly 2a01b1ebcd [formerly 894e6ac1db5b34e6466c68aefa5877b9405bfd59]]]
Former-commit-id: 2a01b1ebcd
Former-commit-id: ecff8cddf2 [formerly 95731087ed]
Former-commit-id: eec604da0d
2014-07-17 13:27:48 -05:00
Steve Harris
f5d6fb1dee Merge branch 'omaha_15.1.1' into omaha_14.4.1
Former-commit-id: 76d548cdc4 [formerly 308246ac7b] [formerly 76d548cdc4 [formerly 308246ac7b] [formerly 5e04680687 [formerly 7605f77e2027026c83c0cc4c1e27ba617efbe70f]]]
Former-commit-id: 5e04680687
Former-commit-id: 08b4236055 [formerly 588bd8dda3]
Former-commit-id: ec1a1bbbf1
2014-07-16 13:21:53 -05:00
Benjamin Phillippe
ec91eaed8f Omaha #3350 Added user/role authentication. Added XACML authorization
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df

Former-commit-id: d4997f5a90 [formerly cebfbebea6] [formerly d4997f5a90 [formerly cebfbebea6] [formerly 6cb73e63a1 [formerly 81d0249971d4004067b6aef672e00417ddb83b36]]]
Former-commit-id: 6cb73e63a1
Former-commit-id: 6959bdcdb2 [formerly 576e2eb0f8]
Former-commit-id: b0ddc103a7
2014-07-16 10:49:24 -05:00
Brian Clements
5adc1da0ac Omaha #3373 jaxb manager refactor
api changes
reworked ogc jaxb manager to use parent class

Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48

Former-commit-id: 33684f3c97 [formerly e4c85f7cd5] [formerly 33684f3c97 [formerly e4c85f7cd5] [formerly e428f257cb [formerly 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb]]]
Former-commit-id: e428f257cb
Former-commit-id: cf3bc3e4f4 [formerly 58a4410763]
Former-commit-id: 80ae53ed0f
2014-07-16 09:00:59 -05:00
Nate Jensen
a559ae9796 Issue #2954 fall back to existing map scales if map scale is missing
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527

Former-commit-id: c07802a208 [formerly 6e21526fd2] [formerly c07802a208 [formerly 6e21526fd2] [formerly ed9bee5533 [formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]]]
Former-commit-id: ed9bee5533
Former-commit-id: 12aa82ee3f [formerly d07ec00b92]
Former-commit-id: 61b8abe589
2014-07-15 18:27:09 -05:00
Steve Harris
bd9067626f Merge branch 'omaha_14.4.1' into omaha_15.1.1
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java

Former-commit-id: a893b9b08a [formerly 05de3fbe54] [formerly a893b9b08a [formerly 05de3fbe54] [formerly a43ffbe052 [formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]]
Former-commit-id: a43ffbe052
Former-commit-id: 6920a273e5 [formerly 202c1a0316]
Former-commit-id: 7bf6b4de06
2014-07-14 12:08:09 -05:00
Nate Jensen
fd9475853b Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
Former-commit-id: a55162c74b [formerly 2531649c55] [formerly a55162c74b [formerly 2531649c55] [formerly 9f58d2e08b [formerly 97a0d0d8be7dd87e472dc0422a68df94d43095e1]]]
Former-commit-id: 9f58d2e08b
Former-commit-id: 289a4bf786 [formerly 363766fcca]
Former-commit-id: ad23d7e95d
2014-07-14 11:15:01 -05:00
Brian Clements
d8ce5db467 Omaha #3371 all subprocesses now killed when cave.sh is killed
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2

Former-commit-id: 0973e5ac41 [formerly 7e70fbda27] [formerly 0973e5ac41 [formerly 7e70fbda27] [formerly ae5fa893a9 [formerly e4becce5325aad266fd93548d27e5e122b145011]]]
Former-commit-id: ae5fa893a9
Former-commit-id: a1bce34fda [formerly e72c34d361]
Former-commit-id: 272c0a2e2d
2014-07-14 08:05:18 -05:00
Richard Peter
878c3fe29e Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
Former-commit-id: 88419fb8f3 [formerly 0222a89cd4] [formerly 88419fb8f3 [formerly 0222a89cd4] [formerly 1c40dc11ef [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]
Former-commit-id: 1c40dc11ef
Former-commit-id: d16ddba2f5 [formerly 2b75d79e0f]
Former-commit-id: d1af1f615d
2014-07-11 17:46:14 -05:00
Brian Clements
b384c87dff Omaha #3333 added grid lightning to cave
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221

Former-commit-id: 555251982b [formerly a50f1e8e70] [formerly 555251982b [formerly a50f1e8e70] [formerly 29fc7e7ec4 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]]
Former-commit-id: 29fc7e7ec4
Former-commit-id: 140a4a4b15 [formerly e25961a39a]
Former-commit-id: db47c98989
2014-07-11 12:18:05 -05:00
Benjamin Phillippe
0c80abcc15 Omaha #3379 Removing DWR
Former-commit-id: cc9e9b427a [formerly d110e8428b] [formerly cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 5eea012728 [formerly 06e73cd55f]
Former-commit-id: 11a8186cbc
2014-07-11 11:56:44 -05:00
Brian Clements
f2d27e2f8b Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298

Former-commit-id: 987d514fa3 [formerly 871a8655c8] [formerly 987d514fa3 [formerly 871a8655c8] [formerly 0113e109d3 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]
Former-commit-id: 0113e109d3
Former-commit-id: ed9ba91d4e [formerly c32592fd1c]
Former-commit-id: 94f5989af7
2014-07-10 16:31:11 -05:00
Brian Clements
5e7da3ffac Omaha #3214 fixed cache object usage in lightning resource
pulse and cloud flashes were not updated properly in the cache

Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486

Former-commit-id: dba1fb3fc1 [formerly 994226e82b] [formerly dba1fb3fc1 [formerly 994226e82b] [formerly ac8f861112 [formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]]
Former-commit-id: ac8f861112
Former-commit-id: f9dad29ad8 [formerly e74fcfbce1]
Former-commit-id: 97451515b6
2014-07-09 14:13:47 -05:00
steve.naples
db04c1a2ec ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88

Former-commit-id: 2ebfd61f12 [formerly 339fcbc18a] [formerly 2ebfd61f12 [formerly 339fcbc18a] [formerly 0bd7b6c65b [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]]
Former-commit-id: 0bd7b6c65b
Former-commit-id: 6b58fb2509 [formerly aa8c11d134]
Former-commit-id: 458dd1fe8f
2014-07-09 15:42:51 +00:00
Nate Jensen
ed4cfdb1f3 Omaha #3361 reduce number of extraneous localization requests at GFE
startup

Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed

Former-commit-id: c3bd61a2c0 [formerly 0c397d2b7e] [formerly c3bd61a2c0 [formerly 0c397d2b7e] [formerly 5547ea1c7d [formerly efa10ca2702ecee4535711be06373e5d079ac117]]]
Former-commit-id: 5547ea1c7d
Former-commit-id: d5f944d203 [formerly af08cc189f]
Former-commit-id: 9931cfdf84
2014-07-09 09:24:31 -05:00
Ron Anderson
a1a980ed6e Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652

Former-commit-id: 4b4629a2fd [formerly 111b04296c] [formerly 4b4629a2fd [formerly 111b04296c] [formerly 5efba03474 [formerly b01b72b896b894568acce6a8dc4d45328a06067a]]]
Former-commit-id: 5efba03474
Former-commit-id: e39615ab7a [formerly 1cc0ff4ab7]
Former-commit-id: 0a7c4c855e
2014-07-09 08:56:06 -05:00
steve.naples
10e2eaa6ed ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673

Former-commit-id: 29ca2338b8 [formerly 75969ceec2] [formerly 29ca2338b8 [formerly 75969ceec2] [formerly 24b0d49a5b [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]]
Former-commit-id: 24b0d49a5b
Former-commit-id: 94e246b619 [formerly ea071e81f5]
Former-commit-id: 23ff3f3fe7
2014-07-08 16:32:08 +00:00
Brian Clements
f3735af783 Omaha #3333 removed redundant field from viz lightning
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978

Former-commit-id: 91b136c2a0 [formerly 572d95e78a] [formerly 91b136c2a0 [formerly 572d95e78a] [formerly e4795f6a13 [formerly 2e701ade395cb2ec81d86af714fad825e146dc25]]]
Former-commit-id: e4795f6a13
Former-commit-id: 9afb344828 [formerly e1d5d86d29]
Former-commit-id: b2a4b1da71
2014-07-07 15:13:28 -05:00
Brian.Dyke
f14f792377 Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: a33fdeb558 [formerly 2ef4767652] [formerly a33fdeb558 [formerly 2ef4767652] [formerly 89c0457b1d [formerly 845aebda9d8af143e3a6828c066b291e0343a020]]]
Former-commit-id: 89c0457b1d
Former-commit-id: 6be18f0dd4 [formerly a2dc10847c]
Former-commit-id: e9e9abd3db
2014-07-07 13:33:35 -04:00
Brian Clements
2bebd393d8 Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing

Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6

Former-commit-id: aeb093ad95 [formerly 0d4cd4bab8] [formerly aeb093ad95 [formerly 0d4cd4bab8] [formerly da53d9ccc7 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 2cea766aed [formerly e6e84d2c71]
Former-commit-id: 9a1bc8c521
2014-07-07 12:29:12 -05:00
Richard Peter
1399f0cd57 Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
Former-commit-id: 4219dbeec8 [formerly ba1bd20407] [formerly 4219dbeec8 [formerly ba1bd20407] [formerly 8c17e9cef2 [formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]
Former-commit-id: 8c17e9cef2
Former-commit-id: 3e19911306 [formerly 741fc59f34]
Former-commit-id: b4e4629d24
2014-07-07 09:39:28 -05:00
Richard Peter
48d293abd6 Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
Former-commit-id: 4312c9c569 [formerly 42ec8874c8] [formerly 4312c9c569 [formerly 42ec8874c8] [formerly 06a1d1555c [formerly 6d960e34632c2f615720c0550296d38feb8c90f6]]]
Former-commit-id: 06a1d1555c
Former-commit-id: d27ebb1175 [formerly 804e9d1035]
Former-commit-id: b97f693554
2014-07-07 09:30:09 -05:00
Ron Anderson
6935f82cfa Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc

Former-commit-id: fd16321f82 [formerly 8d50f9d15a] [formerly fd16321f82 [formerly 8d50f9d15a] [formerly 24faa48233 [formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]]
Former-commit-id: 24faa48233
Former-commit-id: ae401db2ab [formerly 87664d86a5]
Former-commit-id: 9a873532ad
2014-07-07 09:02:14 -05:00
Roger Ferrel
0554d1834c Omaha #3348 Handle Enter event on Open's tree and text field.
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4

Former-commit-id: 1964c7c4f7 [formerly 6305bfdcb6] [formerly 1964c7c4f7 [formerly 6305bfdcb6] [formerly f064f0d102 [formerly 29cc43c5f9b43a51b24b702f04f0a62fab1bd356]]]
Former-commit-id: f064f0d102
Former-commit-id: 74f5c7eb82 [formerly 7649930247]
Former-commit-id: da45f3e5e2
2014-07-07 08:52:50 -05:00
Brian Clements
55bcd816ff Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e

Former-commit-id: c3a25024ae [formerly bfd9f59de8] [formerly c3a25024ae [formerly bfd9f59de8] [formerly e4c9a13adb [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]
Former-commit-id: e4c9a13adb
Former-commit-id: 50d2c6e24c [formerly bd9520f4fe]
Former-commit-id: 276dd801f2
2014-07-03 15:11:48 -05:00
David Friedman
c44e9f88f6 ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1

Former-commit-id: 8784501bba [formerly a45fe1dad0] [formerly 8784501bba [formerly a45fe1dad0] [formerly db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]
Former-commit-id: db8977e281
Former-commit-id: 5270711c5d [formerly d36834080e]
Former-commit-id: 4f53bbd556
2014-07-03 13:58:24 +00:00
Roger Ferrel
862a065051 Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e

Former-commit-id: 2723c92167 [formerly 02d9609862] [formerly 2723c92167 [formerly 02d9609862] [formerly 1869745cce [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]
Former-commit-id: 1869745cce
Former-commit-id: 37c05adfaf [formerly 7f50b8fb93]
Former-commit-id: a7daeebc77
2014-07-02 14:27:28 -05:00
Brian Clements
c502009375 Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc

Former-commit-id: fdec99abc5 [formerly 013292ce9d] [formerly fdec99abc5 [formerly 013292ce9d] [formerly 2773cf8935 [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]
Former-commit-id: 2773cf8935
Former-commit-id: 767d8abd20 [formerly 648ffac146]
Former-commit-id: 6dea5ec026
2014-07-02 14:20:10 -05:00
Juliya Dynina
d3073a02a7 Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: 67580e73cd [formerly 244b2f5f3a] [formerly 67580e73cd [formerly 244b2f5f3a] [formerly 470d50b4e4 [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]]
Former-commit-id: 470d50b4e4
Former-commit-id: d705c8c8a4 [formerly b1cec7d40e]
Former-commit-id: 3f043077b3
2014-07-02 14:17:11 -05:00
Steve Harris
a19a11998f Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: 9b7f820b06 [formerly 136af3f7e2] [formerly 9b7f820b06 [formerly 136af3f7e2] [formerly 0ef8a057f9 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]]
Former-commit-id: 0ef8a057f9
Former-commit-id: cb8192cfaf [formerly 9f61f60f65]
Former-commit-id: a12a736737
2014-07-02 13:38:08 -05:00
Richard Peter
6710269555 Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
Former-commit-id: 9c41b7c23e [formerly 59325cf1f1] [formerly 9c41b7c23e [formerly 59325cf1f1] [formerly 27ba905947 [formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]]
Former-commit-id: 27ba905947
Former-commit-id: a22847695d [formerly 127ce13eb8]
Former-commit-id: a357fc835b
2014-07-02 11:51:26 -05:00
Nate Jensen
54a1daffc6 Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
Former-commit-id: e193fe4719 [formerly 324194117a] [formerly e193fe4719 [formerly 324194117a] [formerly 14b514df2c [formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]]
Former-commit-id: 14b514df2c
Former-commit-id: be426fc965 [formerly f39f6858e2]
Former-commit-id: 760adb2b77
2014-07-02 11:20:26 -05:00
Nate Jensen
f4540db824 Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49

Former-commit-id: 15d6ff7f79 [formerly f6cbccdc5c] [formerly 15d6ff7f79 [formerly f6cbccdc5c] [formerly 74e2bd1670 [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]
Former-commit-id: 74e2bd1670
Former-commit-id: db24013aa6 [formerly e9b31a4429]
Former-commit-id: db9550e367
2014-07-02 11:18:59 -05:00
steve.naples
9f52699bd2 ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f

Former-commit-id: 3d75da3db0 [formerly 66c3241bc4] [formerly 3d75da3db0 [formerly 66c3241bc4] [formerly 4e959af1b4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]
Former-commit-id: 4e959af1b4
Former-commit-id: f1c92f1e35 [formerly 3cfabd29bc]
Former-commit-id: 93c8f822cc
2014-07-02 15:30:48 +00:00
Brian Clements
2cd0d94e5d Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f

Former-commit-id: 08724fefd7 [formerly 8b5ad1ec33] [formerly 08724fefd7 [formerly 8b5ad1ec33] [formerly eac871eed7 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]
Former-commit-id: eac871eed7
Former-commit-id: ea1ac8ee8f [formerly cd282ef018]
Former-commit-id: d066846c3f
2014-07-02 10:02:52 -05:00
Nate Jensen
ef967d42e3 Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372

Former-commit-id: 1373af3e55 [formerly a93af621d8] [formerly 1373af3e55 [formerly a93af621d8] [formerly 765ac1258b [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]
Former-commit-id: 765ac1258b
Former-commit-id: bbd50040a5 [formerly 264ac4d8a3]
Former-commit-id: d1d3aa94a6
2014-07-02 10:01:05 -05:00