Commit graph

2881 commits

Author SHA1 Message Date
Steve Harris
1b2aaf6387 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: ef7ebd22b4 [formerly d940427408] [formerly 53f91fdeea] [formerly ef7ebd22b4 [formerly d940427408] [formerly 53f91fdeea] [formerly e5910b6c60 [formerly 53f91fdeea [formerly b0b18895aa445ee9b29674443529558b2141c042]]]]
Former-commit-id: e5910b6c60
Former-commit-id: 46efda0c29 [formerly 9d4f24da7b] [formerly 81756753feb5c4701663ee447ac1a92dcfa9676d [formerly 1b9ebbddcc]]
Former-commit-id: 5fea27f243c9eecb35421417c3ad89c087bf92ae [formerly 7a7a9cc18e]
Former-commit-id: 76def67552
2014-03-26 16:13:59 -05:00
Bryan Kowal
7cf013ef34 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: d455d71216 [formerly 911c0a99c9] [formerly a554dc8c20] [formerly d455d71216 [formerly 911c0a99c9] [formerly a554dc8c20] [formerly 286051cbb9 [formerly a554dc8c20 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]]
Former-commit-id: 286051cbb9
Former-commit-id: 718bbc47f4 [formerly f0f10e2544] [formerly 92b3111cb9f6f27db1c947559a4696fd1d1b0a4b [formerly 6b28f08242]]
Former-commit-id: ce22ec280d942b3e0262be01d99c367f30ddd085 [formerly f5c1cf750b]
Former-commit-id: 6dc3ae2214
2014-03-26 14:57:46 -05:00
Bryan Kowal
76ff65b153 Merge "Issue #2851 - 64-bit gridslice library for Windows" into development
Former-commit-id: 3821e13dcd [formerly 3f06c30135] [formerly 386e85fce9] [formerly 3821e13dcd [formerly 3f06c30135] [formerly 386e85fce9] [formerly 6df224e171 [formerly 386e85fce9 [formerly c28104c670e68296662a2d81def52d1122a7ef98]]]]
Former-commit-id: 6df224e171
Former-commit-id: 1a1c33b8c8 [formerly d8b088392b] [formerly b1fdb0c4cb169ca5eddb0cdb3e8bfdb6ee9a3dbb [formerly 70fdc03a5c]]
Former-commit-id: b381d3bffe26ed16cde6f061a49487c72c515ad4 [formerly 7a451cd404]
Former-commit-id: ccff1985f9
2014-03-26 09:19:05 -05:00
Brian.Dyke
dc35ed8fe1 Fixed comment merge conflicts added .gitignore
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 6476c4fb85 [formerly 412a7eb2c2] [formerly 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]]
Former-commit-id: 8a69e5f0509d10278a9c81d31ec5d2e0a9d1f376 [formerly c19fc33493]
Former-commit-id: e7aea77979
2014-03-25 15:41:58 -04:00
Ron Anderson
743af9ff6e Merge "Issue #2874 Initial implementation of RTOFS data." into development
Former-commit-id: 1715102f26 [formerly c8b2da72ee] [formerly 1cad7c8ea7] [formerly 1715102f26 [formerly c8b2da72ee] [formerly 1cad7c8ea7] [formerly fdbb505679 [formerly 1cad7c8ea7 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]]
Former-commit-id: fdbb505679
Former-commit-id: ac0f8c1339 [formerly b154755f33] [formerly 1ac36120a099b3b2a502909144590734aecf5303 [formerly bbbf19c72e]]
Former-commit-id: 3c82c84f59dde146d2dc5bd1f90dd7c031a5fdf9 [formerly e7e9cf1e36]
Former-commit-id: d843d14130
2014-03-25 13:20:02 -05:00
Richard Peter
623c22dc31 Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development
Former-commit-id: 4188281e8b [formerly c37a55b552] [formerly 3e2f280091] [formerly 4188281e8b [formerly c37a55b552] [formerly 3e2f280091] [formerly 3221310454 [formerly 3e2f280091 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]]
Former-commit-id: 3221310454
Former-commit-id: e5dc574b44 [formerly 457e51a4ee] [formerly dd67ae29188f830e505220cad6a9914b86728cf8 [formerly 6ebd2444ef]]
Former-commit-id: 9e25d318570ed325f8c438ef3e7becc22eb1ed13 [formerly 4a3238b071]
Former-commit-id: f8765902f3
2014-03-25 13:11:36 -05:00
Nate Jensen
64be4dae2d Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: d1ca7d7c75 [formerly c7dc0baeb9] [formerly 38e3305e60] [formerly d1ca7d7c75 [formerly c7dc0baeb9] [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 38e3305e60 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 0a9da8ca6c [formerly 307cdc15c1] [formerly f289ec627b5f30e10b3a962e1f08f3e13492e4e2 [formerly 7c581cb5d7]]
Former-commit-id: 2b59d9930948c459e8f6edef62cf78dc6f8d5fda [formerly 015dc45eba]
Former-commit-id: a36bdb3b99
2014-03-25 13:11:29 -05:00
Bryan Kowal
55d6a3d893 Issue #2851 - 64-bit gridslice library for Windows
cave/build/static/win32.amd64/cave/lib/gridslice.pyd: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: 4e4f55eb6c [formerly 065e1dac5e] [formerly 37a6b85483] [formerly 4e4f55eb6c [formerly 065e1dac5e] [formerly 37a6b85483] [formerly 53d1b8bcbb [formerly 37a6b85483 [formerly 687a060d44c88723de7f775925536adb9f71a257]]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: 5e07b5f00d [formerly 77601dbb9f] [formerly e2ae36264143a5a4e9f00cb98512d5d27750943e [formerly dcaac3d61d]]
Former-commit-id: c95efa5e24ae795fb1c31d13c054b1b9f956a07a [formerly 95f181f95f]
Former-commit-id: 6a9e1fec9c
2014-03-25 13:03:44 -05:00
Brian.Dyke
fbba012c20 OB_14.1.1-25 baseline
Former-commit-id: c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly 074abeb0fa [formerly c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 5b848e5480 [formerly 95ada25b65] [formerly ec4f283a91b4ae374dc7edc0c06351378f44b61f [formerly 36fdf6bfe4]]
Former-commit-id: 01adcc7557cfbd24c6477e8cc858ba353ef8328c [formerly 05ab17425c]
Former-commit-id: 2ba9b8825b
2014-03-25 13:55:54 -04:00
Mike Duff
e83edec2f9 Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b

Former-commit-id: e0fc16c612 [formerly 1eefb7be44] [formerly 0bfdcdcbe0] [formerly e0fc16c612 [formerly 1eefb7be44] [formerly 0bfdcdcbe0] [formerly befb72d65e [formerly 0bfdcdcbe0 [formerly b69a8729347de1f0a8ab855f778559085c6de741]]]]
Former-commit-id: befb72d65e
Former-commit-id: 78523a861c [formerly f0f10d8061] [formerly 81e6f193a12ca5c960bf6c6512fb2a5e76dbdeec [formerly c13b5959e9]]
Former-commit-id: 8ee7955908dabc55180cbe5783a7c2c0b5910e15 [formerly 8f0a23c91b]
Former-commit-id: a86684f034
2014-03-25 12:13:29 -05:00
Nate Jensen
6a4a03ce29 Merge "Issue #2935 fix refresh issue" into development
Former-commit-id: 61653d8e45 [formerly 07c97d0fda] [formerly 4fe0db7411] [formerly 61653d8e45 [formerly 07c97d0fda] [formerly 4fe0db7411] [formerly 21d448c0bc [formerly 4fe0db7411 [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]]
Former-commit-id: 21d448c0bc
Former-commit-id: c4eb2113d8 [formerly 33c20da77f] [formerly 428b0f96016670efcf89eef5a265277ea2a064c3 [formerly c726dd0589]]
Former-commit-id: 2e7d76cf33686af3c2657509f0c3685de39f22ed [formerly ead4e7833c]
Former-commit-id: 2d08cd2ec7
2014-03-25 11:25:38 -05:00
Mike Duff
3b224f6ac9 Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 1d0edcc2c6 [formerly 758fdca514] [formerly 1e42d8a30d] [formerly 1d0edcc2c6 [formerly 758fdca514] [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 1e42d8a30d [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]]
Former-commit-id: a06f058ea9
Former-commit-id: 47402575c0 [formerly 81ac35a1b8] [formerly 6fb4c8dc2286133134b00c03341141f90a3454df [formerly d497c533e6]]
Former-commit-id: 2740eb49374c5a2de83bcfcf6da18c01c8648899 [formerly 97c4e48255]
Former-commit-id: 7705874ea3
2014-03-25 11:18:09 -05:00
Nate Jensen
d085d6bfcb Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: c6474ef98e [formerly d1f080fd05] [formerly 68f9181340] [formerly c6474ef98e [formerly d1f080fd05] [formerly 68f9181340] [formerly 7b586ebd67 [formerly 68f9181340 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 19b2056aaf [formerly 447b1a36bb] [formerly 1685ee85fb1e67da2bfbc2821c89b427bb01d5d0 [formerly 0cad1fa167]]
Former-commit-id: 48d96d20b890321c6bbe7e22129e08fa04053556 [formerly a5b0c8b432]
Former-commit-id: 8e3b78ba6a
2014-03-25 10:24:11 -05:00
Nate Jensen
fcfad86ab1 Merge "Issue #2954 - Handle missing scale files at cave startup." into development
Former-commit-id: 8f104b014a [formerly e64401eedf] [formerly d11a2dd96b] [formerly 8f104b014a [formerly e64401eedf] [formerly d11a2dd96b] [formerly 9e2a9022ae [formerly d11a2dd96b [formerly 5f8585234a010053c841f2f58a65c6885aea4940]]]]
Former-commit-id: 9e2a9022ae
Former-commit-id: eba1575cf9 [formerly 476e4df3ff] [formerly 57178504bc6c5c5d7cb61e70d2bca941f07ed2d2 [formerly 68298da133]]
Former-commit-id: 37eea3fb44b429aaa5481204be0f99fed1786785 [formerly 82f9b6a092]
Former-commit-id: ef30c5f9c8
2014-03-25 08:37:55 -05:00
Mike Duff
44321505fb Issue #2954 - Handle missing scale files at cave startup.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: a3bf92988a [formerly 39cb0ac9e3] [formerly 372e9dc80f] [formerly a3bf92988a [formerly 39cb0ac9e3] [formerly 372e9dc80f] [formerly 9334bc2b00 [formerly 372e9dc80f [formerly 4b7a68aeca0346f41965b98626e2c728b1a0e532]]]]
Former-commit-id: 9334bc2b00
Former-commit-id: f2c11bd688 [formerly fb0073c74b] [formerly 8d4152bf8316554ef4fe24d94ae4d45059ccf75e [formerly 6de201d3f8]]
Former-commit-id: 57ca440faa2e175864b84fff01d646ec63369f80 [formerly 9c80493102]
Former-commit-id: e33813eef9
2014-03-24 16:38:38 -05:00
Lee Venable
908e23a804 Issue #2951 - added dispose checks for runAsync calls.
Former-commit-id: 0198c5ff1e [formerly 4afcc659a2] [formerly f5c4414c72] [formerly 0198c5ff1e [formerly 4afcc659a2] [formerly f5c4414c72] [formerly c2d52987f8 [formerly f5c4414c72 [formerly c4e17780f5a3dc342b856f83a4144ff3778c4001]]]]
Former-commit-id: c2d52987f8
Former-commit-id: b230e78880 [formerly 2575b680d1] [formerly de469ece47bd6a50ae9f194c5d5c29cdb7e661df [formerly d0ec74f4b7]]
Former-commit-id: ab6d5df188fcb6a58d51b75c086c49ce9d5f2aab [formerly 464ae77609]
Former-commit-id: edcb08e4fe
2014-03-24 16:14:49 -05:00
Nate Jensen
ffd0b3727f Merge "Issue #2868 plot delegate python now uses PythonCoordinatorJob API, Refactored plot data request, image creation, and sample threading" into development
Former-commit-id: 0d8f4f9894 [formerly 0fa5b14762] [formerly 5df9be36da] [formerly 0d8f4f9894 [formerly 0fa5b14762] [formerly 5df9be36da] [formerly a47c32f4b9 [formerly 5df9be36da [formerly 78dbdcb1d98aa7fff15b3b9a9398c335cb45b923]]]]
Former-commit-id: a47c32f4b9
Former-commit-id: d915d24263 [formerly b0616edf0e] [formerly 22a246ea5d586e8a71193286dc6d684e75f9915d [formerly 2d97ef8631]]
Former-commit-id: c707e51b08d00c66e2bc5c25b3fa0f29b2afc422 [formerly 92bf5f5075]
Former-commit-id: d207333ed5
2014-03-24 15:59:20 -05:00
Mike Duff
e9dae1a861 Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: 0fd2a2a426 [formerly eacc161ee4] [formerly fd31ea7fa5] [formerly 0fd2a2a426 [formerly eacc161ee4] [formerly fd31ea7fa5] [formerly ca27ceac1f [formerly fd31ea7fa5 [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]]
Former-commit-id: ca27ceac1f
Former-commit-id: dd804a13ff [formerly 86fc8d74d5] [formerly 26a0a3d7ea325414e2b4fd69c1a38bcc0d1f1c56 [formerly fc7a71889c]]
Former-commit-id: aaf5ab7ad0f3fc0cc724c92a5e30b5288b163eed [formerly a1661a5389]
Former-commit-id: 9075ec61a0
2014-03-24 14:59:33 -05:00
Nate Jensen
6897e58b4e Issue #2868 plot delegate python now uses PythonCoordinatorJob API,
Refactored plot data request, image creation, and sample
              threading

Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918

Former-commit-id: 85b411bca3 [formerly 2418c9bdfe] [formerly fe33896e7e] [formerly 85b411bca3 [formerly 2418c9bdfe] [formerly fe33896e7e] [formerly c4beb293b9 [formerly fe33896e7e [formerly e421731415d798487c96dd1e56b6f02347d9aa26]]]]
Former-commit-id: c4beb293b9
Former-commit-id: df01318647 [formerly 0acb4621f9] [formerly 3d803664963a310bbf45fe46e8f20c9255a3b529 [formerly 774091461c]]
Former-commit-id: c0e78be8fc6eca4dfac050feb6b22af3fded1f5c [formerly 96339798b5]
Former-commit-id: 5b6683bd56
2014-03-24 14:59:31 -05:00
Lee Venable
c3fc029557 Issue #1426 - fixed arrow buttons and simplified the code.
Former-commit-id: ae20115f26 [formerly 75504da2bc] [formerly 702ebe6881] [formerly ae20115f26 [formerly 75504da2bc] [formerly 702ebe6881] [formerly 4c80552979 [formerly 702ebe6881 [formerly fc55337ba9768a7b9e6ecde11f8c8ddfd32c4859]]]]
Former-commit-id: 4c80552979
Former-commit-id: df75b3fdf3 [formerly 5b0f8f631f] [formerly 62fef10759c19715b0dfa7dbcac04f2cc05c70d1 [formerly 18de63886c]]
Former-commit-id: 80dd1ca1ac8d916b7fabf27c7599e3118b0bf72c [formerly 3af5936abd]
Former-commit-id: ca68a98f36
2014-03-24 14:08:49 -05:00
Ben Steffensmeier
1aa51a118b Issue #2874 Initial implementation of RTOFS data.
Former-commit-id: 9e2e500040 [formerly 1c18e800b3] [formerly 55046a8e1e] [formerly 9e2e500040 [formerly 1c18e800b3] [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: 26558fad1e [formerly aadc22091e] [formerly 17445664d752b4ffa0186bdce951baaffefd1f21 [formerly ab8293c6a1]]
Former-commit-id: b8e1bca2fe93a3c4fa125052086c7d64a243b406 [formerly d20a1a6f54]
Former-commit-id: 77d809f66a
2014-03-24 11:10:18 -05:00
Brian.Dyke
91da395a71 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: 402035e7f9 [formerly d97b88f433] [formerly 1a63c19999c01830d72a5d605c2cc1247fc3b4eb [formerly 14567f20a7]]
Former-commit-id: 2c253da743c15a00910b72d8aac49c5cbb6f5609 [formerly f540c6fb2d]
Former-commit-id: aea0544eec
2014-03-24 07:01:29 -04:00
Lee Venable
d08f39f428 Issue #2925 - Fixed NPE found during testing.
Former-commit-id: a700d23f6d [formerly cc7d240cfd] [formerly c29981fa99] [formerly a700d23f6d [formerly cc7d240cfd] [formerly c29981fa99] [formerly 5b73c516d3 [formerly c29981fa99 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 1fb169f1ce [formerly 05a4c4e31b] [formerly 0052d9d30c35dc39dd69aece42fc59a0f471c58f [formerly f08d4a827f]]
Former-commit-id: 275c2d56eebfcd30f92e3347955172f87a580714 [formerly 2384cc90c0]
Former-commit-id: f160e66a85
2014-03-21 12:42:13 -05:00
Brian.Dyke
1f96787564 OB_14.1.1-24 baseline
Former-commit-id: 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]]
Former-commit-id: face1ebeeb
Former-commit-id: 49f7c81de1 [formerly cfa058a345] [formerly 96a438276ab6f5a4af7ac304e214e79258c0ea3d [formerly 6b2175da93]]
Former-commit-id: bd70e5cfe36861d8349138232ac519963886caa3 [formerly 2fda566cfb]
Former-commit-id: 7aeb9af309
2014-03-21 12:43:50 -04:00
Lee Venable
de9d1af5f3 Merge "Issue #2925 - added runAsync dispose checks." into development
Former-commit-id: 64d34ed4f9 [formerly d8f6d3eeb4] [formerly 7d4062dc66] [formerly 64d34ed4f9 [formerly d8f6d3eeb4] [formerly 7d4062dc66] [formerly 597fe2b674 [formerly 7d4062dc66 [formerly cb16fae6fd3cebdf1c80fc18dbc2684c27018b3d]]]]
Former-commit-id: 597fe2b674
Former-commit-id: deed3a9c06 [formerly b5e946dc69] [formerly d762adb3703d6843664b354516289ef76bb2124d [formerly 88619d51a1]]
Former-commit-id: 92879dcbafc7bc41fe8eeca7722c8af11eb8111f [formerly 9ec7c38125]
Former-commit-id: 22f0babb46
2014-03-20 17:49:30 -05:00
Nate Jensen
0a5f091486 Merge "Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image." into development
Former-commit-id: 2bafcb76db [formerly 94c25f784e] [formerly 8a3c03b260] [formerly 2bafcb76db [formerly 94c25f784e] [formerly 8a3c03b260] [formerly a47328b3cb [formerly 8a3c03b260 [formerly 8fddee15ee0fbe36c917b06cdf64f76c2b69fc86]]]]
Former-commit-id: a47328b3cb
Former-commit-id: 6648b1e27d [formerly bcd700102f] [formerly 8afd6cacbfee0b65da4e23a075dd05ea687d8f23 [formerly a5cf7bd6e0]]
Former-commit-id: f5079a1fd840d8822946961d4bf7facbe88fe2f1 [formerly 229672e8bc]
Former-commit-id: eff32cc336
2014-03-20 14:22:57 -05:00
Nate Jensen
a70dc487c7 Merge "Issue #2791 fix NaN handling of smoothed contours." into development
Former-commit-id: 616223209c [formerly d2ad1bf3f2] [formerly f9b86f97e0] [formerly 616223209c [formerly d2ad1bf3f2] [formerly f9b86f97e0] [formerly c64f0b2558 [formerly f9b86f97e0 [formerly 347b9555cfe67ee5643b92bd84afbd1e2899acd7]]]]
Former-commit-id: c64f0b2558
Former-commit-id: a1b495a7e0 [formerly 57907af1e8] [formerly 32458c382ac205016b72c60e7a7b4b49d5521d53 [formerly 59485dbac7]]
Former-commit-id: 2bd0d30ea7215c81c3c98ca4bb700f90d96e6ce8 [formerly af4b4c326b]
Former-commit-id: 12c127a163
2014-03-20 14:19:17 -05:00
Ben Steffensmeier
8b2f8b7347 Issue #2791 fix NaN handling of smoothed contours.
Former-commit-id: 4680d9d66f [formerly b9cbe28411] [formerly 76fcfe163e] [formerly 4680d9d66f [formerly b9cbe28411] [formerly 76fcfe163e] [formerly c5aac15437 [formerly 76fcfe163e [formerly a6f8a0bd2758008997555e08ea7245517535b1db]]]]
Former-commit-id: c5aac15437
Former-commit-id: 9d52b9ecf4 [formerly 133767ff26] [formerly 0c3f9d051c5003a7a6bcdcabfe921b98bd997d74 [formerly a9ee8b9b2f]]
Former-commit-id: b6d759a4afc3eb1cb96c1cab2e37e5a85ba5102d [formerly 466ce63273]
Former-commit-id: 49ebe73b07
2014-03-20 13:34:52 -05:00
Ben Steffensmeier
fd5bf96d28 Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image.
Former-commit-id: 5e7cd41675 [formerly ff0dfb0b11] [formerly 286f447a9c] [formerly 5e7cd41675 [formerly ff0dfb0b11] [formerly 286f447a9c] [formerly 14af3282cb [formerly 286f447a9c [formerly db3ffd586611ea8692728ea0de5451cec89421b6]]]]
Former-commit-id: 14af3282cb
Former-commit-id: 134cd13dee [formerly 4fbe62066a] [formerly 1b1c88088b01d2a2b0b3c1a4df9c3cfc6fbea3fb [formerly 48dac44df4]]
Former-commit-id: 84178e4448839103cd3c7d85a75a09a6c5abd585 [formerly bb39a48e5b]
Former-commit-id: 166f571c84
2014-03-20 13:31:08 -05:00
Brad Gonzales
b404e07694 Issue #2873 Removed 32 bit native libraries and references.
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: 25050d57f6 [formerly de508133ff] [formerly 08dde4824f] [formerly 25050d57f6 [formerly de508133ff] [formerly 08dde4824f] [formerly 189234f162 [formerly 08dde4824f [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]]]
Former-commit-id: 189234f162
Former-commit-id: 02a20c0e37 [formerly 0022633626] [formerly b1f2574d3b73438b586d2b8edcd4477283696b6d [formerly d303662a51]]
Former-commit-id: 9d6f627b3d954f1806f2ed939de355f3fe6bafcb [formerly f859a625d0]
Former-commit-id: 412262edcf
2014-03-20 13:27:39 -05:00
Lee Venable
89b17a4b1d Issue #2925 - added runAsync dispose checks.
Change-Id: I4048f4b4ae8976d93b1bee89179be527ee3139e5

Former-commit-id: b1d2e221fd [formerly 43cfdc587a] [formerly 112f7a886e] [formerly b1d2e221fd [formerly 43cfdc587a] [formerly 112f7a886e] [formerly 397cb233d4 [formerly 112f7a886e [formerly 2ebffdcfca606309daa3ed587f696a95af0b094e]]]]
Former-commit-id: 397cb233d4
Former-commit-id: 726643d800 [formerly 30f7cac193] [formerly 8bf9e4370bd960a8ee23f520ef69911e15a0ba3f [formerly 2a6f9e8a85]]
Former-commit-id: 307d52f276ccba912990a9b4825775b2e246f16e [formerly 60f93fef09]
Former-commit-id: bf055bee25
2014-03-20 13:09:17 -05:00
Mike Duff
c0f8497363 Issue #2857 - Implement Redbook NCO NDM menus
Change-Id: I93e9f21e8b7e797affe1e52c7baef0217433460b

Former-commit-id: e03e5c8f45 [formerly 645e16792e] [formerly c67f9c4be2] [formerly e03e5c8f45 [formerly 645e16792e] [formerly c67f9c4be2] [formerly 4ec18a8178 [formerly c67f9c4be2 [formerly 2ddd856c9297a782340dc0fb9db2a9d36048f760]]]]
Former-commit-id: 4ec18a8178
Former-commit-id: 8964d6a60d [formerly 80855b8e08] [formerly e63dd7b97cdada1bb29c5901f8eaaa015a51d9ee [formerly a624cd8053]]
Former-commit-id: 9f88b8c3fbc34b95661157c5c211ca13bad31db5 [formerly bb07313742]
Former-commit-id: ab451ac799
2014-03-20 11:24:48 -05:00
Mike Duff
fc7b7be21e Issue #2856 - Implement Redbook CPC ndm menus
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693

Former-commit-id: 6ad3953d46 [formerly cdee2df27f] [formerly 25c8a0a8aa] [formerly 6ad3953d46 [formerly cdee2df27f] [formerly 25c8a0a8aa] [formerly 40319e5fcf [formerly 25c8a0a8aa [formerly 8d9935cbee365c4a8537da610c2aff4d95c50f40]]]]
Former-commit-id: 40319e5fcf
Former-commit-id: e5cb254e1f [formerly af9f9ba2c8] [formerly 31a71f35a6008ebcda10116a7d783af50488d1a0 [formerly 09be0ef28d]]
Former-commit-id: 37e8bd089fdefb30fe5b84d51c3556a1bccab1d1 [formerly 9335ae821e]
Former-commit-id: df31189a39
2014-03-20 11:16:35 -05:00
Mike Duff
10d0d4992a Issue #2859 - Implement redbook MPC NDM menus
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e

Former-commit-id: f49bb3b30c [formerly 4be30fdc5b] [formerly 059ac9c52a] [formerly f49bb3b30c [formerly 4be30fdc5b] [formerly 059ac9c52a] [formerly e479bd7055 [formerly 059ac9c52a [formerly 619efadc2230af13707f124534d3caf2fdfaba68]]]]
Former-commit-id: e479bd7055
Former-commit-id: 22a240a919 [formerly 0b94340d7e] [formerly 9530e3b61c98479d8b44cd26d6af7c2592220ee4 [formerly bb07c57f3e]]
Former-commit-id: 5b7d5893723208a47539da1bfb042f9e6721c7bf [formerly c67dacabf5]
Former-commit-id: 580af4bdeb
2014-03-19 14:40:00 -05:00
Lee Venable
e60d6d27ae Merge "Issue #2433 - Implement view by priority check box menus review comments" into development
Former-commit-id: b94ed41ba2 [formerly 12aa173989] [formerly 96ea26a9a2] [formerly b94ed41ba2 [formerly 12aa173989] [formerly 96ea26a9a2] [formerly ab3de987b4 [formerly 96ea26a9a2 [formerly 27cb84fc6629e94927a4e80cba9586df20805b0a]]]]
Former-commit-id: ab3de987b4
Former-commit-id: 9c2583527b [formerly 4ed1e7327e] [formerly 8daa78433782df24239da5092047d00e8f37b314 [formerly 9784b3737e]]
Former-commit-id: 50caae37371681677237dd625f0273a2cda32223 [formerly 51234efbbb]
Former-commit-id: c59ab27cd4
2014-03-19 08:54:39 -05:00
Nate Jensen
c3aeb2ee08 Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development
Former-commit-id: 5cabc0fae4 [formerly bc9f494604] [formerly 3ee42187e6] [formerly 5cabc0fae4 [formerly bc9f494604] [formerly 3ee42187e6] [formerly d44fee0588 [formerly 3ee42187e6 [formerly ad4deae1563ea5f311c3428cefb82bf156392310]]]]
Former-commit-id: d44fee0588
Former-commit-id: e6c3f1ebde [formerly 116c66b685] [formerly 72132a253e2e7256f06ae4c2302a82771786c200 [formerly 99643d9545]]
Former-commit-id: 38803f287548172e209241584789c0ee34db2540 [formerly beeabfec37]
Former-commit-id: 6d25649178
2014-03-18 17:01:44 -05:00
Mike Duff
d2c122d33e Issue #2433 - Implement view by priority check box menus
review comments

Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7

Former-commit-id: ff60e94886 [formerly 9d24291927] [formerly a7e568e799] [formerly ff60e94886 [formerly 9d24291927] [formerly a7e568e799] [formerly 202a822384 [formerly a7e568e799 [formerly ca228b57089101c61f9d3f76d7edc4ba96c41b61]]]]
Former-commit-id: 202a822384
Former-commit-id: abdb23de45 [formerly b0554f903f] [formerly ba75492450a6de73eb2eca3f12050a20d3ebb3d1 [formerly 980e398584]]
Former-commit-id: f0b639f96cfa04622cf09153ea52e8b8dbf500ae [formerly 43744f0255]
Former-commit-id: ae25f4e867
2014-03-18 16:42:58 -05:00
Nate Jensen
609843c955 Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
Former-commit-id: 350786f305 [formerly 61c5a25407] [formerly 85e3ac041a] [formerly 350786f305 [formerly 61c5a25407] [formerly 85e3ac041a] [formerly 7e7745cd7b [formerly 85e3ac041a [formerly 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393]]]]
Former-commit-id: 7e7745cd7b
Former-commit-id: a1a8f1301d [formerly e3bc322d49] [formerly 7e6b7e93a2aaaab43dd435634d25d8d512cd812b [formerly 3e32812f13]]
Former-commit-id: f1fdbeb2127cd49d5c53a3b7d78123fcbf952e1d [formerly f823e46676]
Former-commit-id: e25dd853df
2014-03-18 13:13:53 -05:00
Nate Jensen
a99fd8dbbb Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 1447abe995 [formerly 68b60eba47] [formerly e75d3dfb7c] [formerly 1447abe995 [formerly 68b60eba47] [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly e75d3dfb7c [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 52e60a68a9 [formerly 8589374171] [formerly 389d920f6cf85e74cfa2b1864b84d9f952b0b23a [formerly ca1ec93450]]
Former-commit-id: 2113aab9642e8adaee09df90029c31ddc9b73949 [formerly 5cb38bd511]
Former-commit-id: 1125203c93
2014-03-18 12:52:01 -05:00
Nate Jensen
07a23a916d Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development
Former-commit-id: 5cc3fd4451 [formerly b5f2064207] [formerly 5f79ece006] [formerly 5cc3fd4451 [formerly b5f2064207] [formerly 5f79ece006] [formerly e9be36b08c [formerly 5f79ece006 [formerly 1c87269eac595b61cc54c1e39ec8624ba55fd6d8]]]]
Former-commit-id: e9be36b08c
Former-commit-id: 0eb6080598 [formerly 8ebc031a07] [formerly fb49f6167522402ef7ee3b3b6d33a4fef770eb46 [formerly a4728542c5]]
Former-commit-id: 65cf554e61e6e04d4ad7ea934ac03bf5f1e8ea45 [formerly 4483a54b05]
Former-commit-id: 19a66e94b9
2014-03-18 12:38:48 -05:00
Mike Duff
6f1a28796f Issue #2798 - Fix issue with color not changing for existing user changing site.
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: 3d62505600 [formerly ac65a87fe5] [formerly 3d10260065] [formerly 3d62505600 [formerly ac65a87fe5] [formerly 3d10260065] [formerly 7bdef60a55 [formerly 3d10260065 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]]]
Former-commit-id: 7bdef60a55
Former-commit-id: e0d65b3d63 [formerly 1a3e88c5da] [formerly 28df91565a1ef26047c815bc98382442f1c3836b [formerly 5bbe504f82]]
Former-commit-id: 18df7f16b5a9135e21e0b5b37cd5579d82035bca [formerly b560f16623]
Former-commit-id: 179082ebf9
2014-03-18 11:55:00 -05:00
Mike Duff
f696d21d79 Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
Peer review comments

Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef

Former-commit-id: d757b01edd [formerly 26866f4d73] [formerly 105a11d8f9] [formerly d757b01edd [formerly 26866f4d73] [formerly 105a11d8f9] [formerly cb6a3e2cf5 [formerly 105a11d8f9 [formerly 29a88687a788305be537ef97cce13e3f45338205]]]]
Former-commit-id: cb6a3e2cf5
Former-commit-id: 66d25b52b6 [formerly ae979e09f5] [formerly ccb7af23738b661ca7c7082b674c4f1d8292999e [formerly d98f4b2ab0]]
Former-commit-id: d81f9a460947b85ffa0942facc186cfe7fbf0e10 [formerly ef7847bc14]
Former-commit-id: 397af6e36e
2014-03-18 11:32:28 -05:00
Nate Jensen
db470217e9 Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development
Former-commit-id: 10f1070f26 [formerly 3d7de2ad9a] [formerly 6ddf9a2ee7] [formerly 10f1070f26 [formerly 3d7de2ad9a] [formerly 6ddf9a2ee7] [formerly 6148c00ed2 [formerly 6ddf9a2ee7 [formerly 5b287c87e27e77b07b2f72030bf9e23c72e50912]]]]
Former-commit-id: 6148c00ed2
Former-commit-id: d8ca3106d8 [formerly d2fbbdc147] [formerly a7bd6dd1d051c37aac2ec1554b89736a07412ca4 [formerly e77738ef65]]
Former-commit-id: 3293da246be92d8771ace8f218803af1dff37492 [formerly c363fc886c]
Former-commit-id: f609b46ec5
2014-03-18 09:20:16 -05:00
Steve Harris
24c55c616c Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
2014-03-17 15:55:41 -05:00
Steve Harris
157a9ed352 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 2db52dab8e [formerly 951c9b0d31] [formerly d087c8c31e] [formerly 2db52dab8e [formerly 951c9b0d31] [formerly d087c8c31e] [formerly 24fe6a248f [formerly d087c8c31e [formerly 543090e28936ce680e21cda802cfac73ff31ca58]]]]
Former-commit-id: 24fe6a248f
Former-commit-id: 78afbbe325 [formerly 5abea804af] [formerly a54cf16be99c26422929ca49bb4ae500bc503e48 [formerly f878fe8729]]
Former-commit-id: cfa704622f94511321108ca762111c90fac4bd03 [formerly 6cc8f3a295]
Former-commit-id: a612c4e6dd
2014-03-17 15:53:31 -05:00
Nate Jensen
913ded4fd3 Issue #2908 attempt to fix build
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480

Former-commit-id: 5f8e5a3331 [formerly b5f3aee368] [formerly 78afc6040c] [formerly 5f8e5a3331 [formerly b5f3aee368] [formerly 78afc6040c] [formerly 9cf43e7de6 [formerly 78afc6040c [formerly 131d45e260ab446e9764d0fcc1f542ef012ff352]]]]
Former-commit-id: 9cf43e7de6
Former-commit-id: c4fe787a80 [formerly cf171e67ed] [formerly fab84c1417570b64126103092b6ab9ac3f6bb28e [formerly d4596770ee]]
Former-commit-id: 489cd6eab30b705e2916e5b32e18fe24b3be513a [formerly c6db5c24b1]
Former-commit-id: 0014f6142f
2014-03-14 14:14:37 -05:00
Brian.Dyke
85d43db6af Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 30084d7f84 [formerly 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]]
Former-commit-id: 30084d7f84
Former-commit-id: 024d49d48b [formerly 916fec5a4f] [formerly ef3d48a76a5bbff4e7d32e4ab3916273c583f0ec [formerly 2109409b24]]
Former-commit-id: 45c14c936cdd09a6b0550940abd94e61b8350680 [formerly f20020876a]
Former-commit-id: 92ed2895fb
2014-03-14 10:15:53 -04:00
Brian.Dyke
b6b38c0121 Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly f999e48df0 [formerly d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]]
Former-commit-id: f999e48df0
Former-commit-id: 86ec9a50d4 [formerly 82756e3855] [formerly 2bdb02ad2c8ccb7c77ded0fd2df41688dea93867 [formerly 3ab2df3507]]
Former-commit-id: 1bf9fe1b47eeea3a212497f6320423ebad1117f1 [formerly 76271269c5]
Former-commit-id: 516ba8e81a
2014-03-14 08:44:39 -04:00
Bryan Kowal
6fe29d2c4a Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
Former-commit-id: 0e4fbed3ef [formerly 3e90c26b14] [formerly 9b2af366c1] [formerly 0e4fbed3ef [formerly 3e90c26b14] [formerly 9b2af366c1] [formerly 6ba13b2b44 [formerly 9b2af366c1 [formerly 5f0d983aa7cd428d532aa3b418eaddf21e31718a]]]]
Former-commit-id: 6ba13b2b44
Former-commit-id: 35d9056fee [formerly f0ff052afc] [formerly 816b374f58a9d0828d47626217f16d7f05d481b6 [formerly 2b053a3bc8]]
Former-commit-id: a303233de138617fede7bf0b42801e75a29b7e04 [formerly 9cfde0458f]
Former-commit-id: a099c8d647
2014-03-13 17:39:32 -05:00
Kevin P. Johnson
fd16da4ae4 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly 4c833d3389 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]]
Former-commit-id: 4c833d3389
Former-commit-id: 54316530e4 [formerly 32b372db4b] [formerly 6cd2437734cdee7992443a141d1ae3334e20f72d [formerly 17a4229072]]
Former-commit-id: 692a687b6edde3278b185df9e4ad90705444abee [formerly eb12ec9c14]
Former-commit-id: 90a9e642e3
2014-03-13 20:42:12 +00:00