Steve Harris
|
d9af02b1d2
|
Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 29f4f53d27 [formerly a70710b467] [formerly 29f4f53d27 [formerly a70710b467] [formerly 656ae897c1 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]
Former-commit-id: 656ae897c1
Former-commit-id: b99ed0cce6 [formerly b1d31f21bc]
Former-commit-id: 2d6dde4ac6
|
2014-03-26 16:19:26 -05:00 |
|
Steve Harris
|
76def67552
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: d940427408 [formerly 53f91fdeea] [formerly d940427408 [formerly 53f91fdeea] [formerly e5910b6c60 [formerly b0b18895aa445ee9b29674443529558b2141c042]]]
Former-commit-id: e5910b6c60
Former-commit-id: 9d4f24da7b [formerly 1b9ebbddcc]
Former-commit-id: 7a7a9cc18e
|
2014-03-26 16:13:59 -05:00 |
|
Bryan Kowal
|
ccff1985f9
|
Merge "Issue #2851 - 64-bit gridslice library for Windows" into development
Former-commit-id: 3f06c30135 [formerly 386e85fce9] [formerly 3f06c30135 [formerly 386e85fce9] [formerly 6df224e171 [formerly c28104c670e68296662a2d81def52d1122a7ef98]]]
Former-commit-id: 6df224e171
Former-commit-id: d8b088392b [formerly 70fdc03a5c]
Former-commit-id: 7a451cd404
|
2014-03-26 09:19:05 -05:00 |
|
Brian.Dyke
|
e7aea77979
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 027cca8673 [formerly 7cc471a9c9] [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 412a7eb2c2 [formerly d8256c4226]
Former-commit-id: c19fc33493
|
2014-03-25 15:41:58 -04:00 |
|
Ron Anderson
|
d843d14130
|
Merge "Issue #2874 Initial implementation of RTOFS data." into development
Former-commit-id: c8b2da72ee [formerly 1cad7c8ea7] [formerly c8b2da72ee [formerly 1cad7c8ea7] [formerly fdbb505679 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]
Former-commit-id: fdbb505679
Former-commit-id: b154755f33 [formerly bbbf19c72e]
Former-commit-id: e7e9cf1e36
|
2014-03-25 13:20:02 -05:00 |
|
Richard Peter
|
f8765902f3
|
Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development
Former-commit-id: c37a55b552 [formerly 3e2f280091] [formerly c37a55b552 [formerly 3e2f280091] [formerly 3221310454 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]
Former-commit-id: 3221310454
Former-commit-id: 457e51a4ee [formerly 6ebd2444ef]
Former-commit-id: 4a3238b071
|
2014-03-25 13:11:36 -05:00 |
|
Nate Jensen
|
a36bdb3b99
|
Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: c7dc0baeb9 [formerly 38e3305e60] [formerly c7dc0baeb9 [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 307cdc15c1 [formerly 7c581cb5d7]
Former-commit-id: 015dc45eba
|
2014-03-25 13:11:29 -05:00 |
|
Bryan Kowal
|
6a9e1fec9c
|
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: 065e1dac5e [formerly 37a6b85483] [formerly 065e1dac5e [formerly 37a6b85483] [formerly 53d1b8bcbb [formerly 687a060d44c88723de7f775925536adb9f71a257]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: 77601dbb9f [formerly dcaac3d61d]
Former-commit-id: 95f181f95f
|
2014-03-25 13:03:44 -05:00 |
|
Brian.Dyke
|
2ba9b8825b
|
OB_14.1.1-25 baseline
Former-commit-id: c085bc6879 [formerly c67833407c] [formerly c085bc6879 [formerly c67833407c] [formerly 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 95ada25b65 [formerly 36fdf6bfe4]
Former-commit-id: 05ab17425c
|
2014-03-25 13:55:54 -04:00 |
|
Mike Duff
|
a86684f034
|
Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b
Former-commit-id: 1eefb7be44 [formerly 0bfdcdcbe0] [formerly 1eefb7be44 [formerly 0bfdcdcbe0] [formerly befb72d65e [formerly b69a8729347de1f0a8ab855f778559085c6de741]]]
Former-commit-id: befb72d65e
Former-commit-id: f0f10d8061 [formerly c13b5959e9]
Former-commit-id: 8f0a23c91b
|
2014-03-25 12:13:29 -05:00 |
|
Nate Jensen
|
2d08cd2ec7
|
Merge "Issue #2935 fix refresh issue" into development
Former-commit-id: 07c97d0fda [formerly 4fe0db7411] [formerly 07c97d0fda [formerly 4fe0db7411] [formerly 21d448c0bc [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]
Former-commit-id: 21d448c0bc
Former-commit-id: 33c20da77f [formerly c726dd0589]
Former-commit-id: ead4e7833c
|
2014-03-25 11:25:38 -05:00 |
|
Mike Duff
|
7705874ea3
|
Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2
Former-commit-id: 758fdca514 [formerly 1e42d8a30d] [formerly 758fdca514 [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]
Former-commit-id: a06f058ea9
Former-commit-id: 81ac35a1b8 [formerly d497c533e6]
Former-commit-id: 97c4e48255
|
2014-03-25 11:18:09 -05:00 |
|
Nate Jensen
|
8e3b78ba6a
|
Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994
Former-commit-id: d1f080fd05 [formerly 68f9181340] [formerly d1f080fd05 [formerly 68f9181340] [formerly 7b586ebd67 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 447b1a36bb [formerly 0cad1fa167]
Former-commit-id: a5b0c8b432
|
2014-03-25 10:24:11 -05:00 |
|
Nate Jensen
|
ef30c5f9c8
|
Merge "Issue #2954 - Handle missing scale files at cave startup." into development
Former-commit-id: e64401eedf [formerly d11a2dd96b] [formerly e64401eedf [formerly d11a2dd96b] [formerly 9e2a9022ae [formerly 5f8585234a010053c841f2f58a65c6885aea4940]]]
Former-commit-id: 9e2a9022ae
Former-commit-id: 476e4df3ff [formerly 68298da133]
Former-commit-id: 82f9b6a092
|
2014-03-25 08:37:55 -05:00 |
|
Mike Duff
|
e33813eef9
|
Issue #2954 - Handle missing scale files at cave startup.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: 39cb0ac9e3 [formerly 372e9dc80f] [formerly 39cb0ac9e3 [formerly 372e9dc80f] [formerly 9334bc2b00 [formerly 4b7a68aeca0346f41965b98626e2c728b1a0e532]]]
Former-commit-id: 9334bc2b00
Former-commit-id: fb0073c74b [formerly 6de201d3f8]
Former-commit-id: 9c80493102
|
2014-03-24 16:38:38 -05:00 |
|
Lee Venable
|
edcb08e4fe
|
Issue #2951 - added dispose checks for runAsync calls.
Former-commit-id: 4afcc659a2 [formerly f5c4414c72] [formerly 4afcc659a2 [formerly f5c4414c72] [formerly c2d52987f8 [formerly c4e17780f5a3dc342b856f83a4144ff3778c4001]]]
Former-commit-id: c2d52987f8
Former-commit-id: 2575b680d1 [formerly d0ec74f4b7]
Former-commit-id: 464ae77609
|
2014-03-24 16:14:49 -05:00 |
|
Nate Jensen
|
d207333ed5
|
Merge "Issue #2868 plot delegate python now uses PythonCoordinatorJob API, Refactored plot data request, image creation, and sample threading" into development
Former-commit-id: 0fa5b14762 [formerly 5df9be36da] [formerly 0fa5b14762 [formerly 5df9be36da] [formerly a47c32f4b9 [formerly 78dbdcb1d98aa7fff15b3b9a9398c335cb45b923]]]
Former-commit-id: a47c32f4b9
Former-commit-id: b0616edf0e [formerly 2d97ef8631]
Former-commit-id: 92bf5f5075
|
2014-03-24 15:59:20 -05:00 |
|
Mike Duff
|
9075ec61a0
|
Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840
Former-commit-id: eacc161ee4 [formerly fd31ea7fa5] [formerly eacc161ee4 [formerly fd31ea7fa5] [formerly ca27ceac1f [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]
Former-commit-id: ca27ceac1f
Former-commit-id: 86fc8d74d5 [formerly fc7a71889c]
Former-commit-id: a1661a5389
|
2014-03-24 14:59:33 -05:00 |
|
Nate Jensen
|
5b6683bd56
|
Issue #2868 plot delegate python now uses PythonCoordinatorJob API,
Refactored plot data request, image creation, and sample
threading
Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918
Former-commit-id: 2418c9bdfe [formerly fe33896e7e] [formerly 2418c9bdfe [formerly fe33896e7e] [formerly c4beb293b9 [formerly e421731415d798487c96dd1e56b6f02347d9aa26]]]
Former-commit-id: c4beb293b9
Former-commit-id: 0acb4621f9 [formerly 774091461c]
Former-commit-id: 96339798b5
|
2014-03-24 14:59:31 -05:00 |
|
Lee Venable
|
ca68a98f36
|
Issue #1426 - fixed arrow buttons and simplified the code.
Former-commit-id: 75504da2bc [formerly 702ebe6881] [formerly 75504da2bc [formerly 702ebe6881] [formerly 4c80552979 [formerly fc55337ba9768a7b9e6ecde11f8c8ddfd32c4859]]]
Former-commit-id: 4c80552979
Former-commit-id: 5b0f8f631f [formerly 18de63886c]
Former-commit-id: 3af5936abd
|
2014-03-24 14:08:49 -05:00 |
|
Ben Steffensmeier
|
77d809f66a
|
Issue #2874 Initial implementation of RTOFS data.
Former-commit-id: 1c18e800b3 [formerly 55046a8e1e] [formerly 1c18e800b3 [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: aadc22091e [formerly ab8293c6a1]
Former-commit-id: d20a1a6f54
|
2014-03-24 11:10:18 -05:00 |
|
Brian.Dyke
|
aea0544eec
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 50e5f4f78d [formerly 06ee9a6384] [formerly 50e5f4f78d [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: d97b88f433 [formerly 14567f20a7]
Former-commit-id: f540c6fb2d
|
2014-03-24 07:01:29 -04:00 |
|
Lee Venable
|
f160e66a85
|
Issue #2925 - Fixed NPE found during testing.
Former-commit-id: cc7d240cfd [formerly c29981fa99] [formerly cc7d240cfd [formerly c29981fa99] [formerly 5b73c516d3 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 05a4c4e31b [formerly f08d4a827f]
Former-commit-id: 2384cc90c0
|
2014-03-21 12:42:13 -05:00 |
|
Brian.Dyke
|
7aeb9af309
|
OB_14.1.1-24 baseline
Former-commit-id: 37e9d48d45 [formerly 37b6368268] [formerly 37e9d48d45 [formerly 37b6368268] [formerly face1ebeeb [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: cfa058a345 [formerly 6b2175da93]
Former-commit-id: 2fda566cfb
|
2014-03-21 12:43:50 -04:00 |
|
Lee Venable
|
22f0babb46
|
Merge "Issue #2925 - added runAsync dispose checks." into development
Former-commit-id: d8f6d3eeb4 [formerly 7d4062dc66] [formerly d8f6d3eeb4 [formerly 7d4062dc66] [formerly 597fe2b674 [formerly cb16fae6fd3cebdf1c80fc18dbc2684c27018b3d]]]
Former-commit-id: 597fe2b674
Former-commit-id: b5e946dc69 [formerly 88619d51a1]
Former-commit-id: 9ec7c38125
|
2014-03-20 17:49:30 -05:00 |
|
Nate Jensen
|
eff32cc336
|
Merge "Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image." into development
Former-commit-id: 94c25f784e [formerly 8a3c03b260] [formerly 94c25f784e [formerly 8a3c03b260] [formerly a47328b3cb [formerly 8fddee15ee0fbe36c917b06cdf64f76c2b69fc86]]]
Former-commit-id: a47328b3cb
Former-commit-id: bcd700102f [formerly a5cf7bd6e0]
Former-commit-id: 229672e8bc
|
2014-03-20 14:22:57 -05:00 |
|
Nate Jensen
|
12c127a163
|
Merge "Issue #2791 fix NaN handling of smoothed contours." into development
Former-commit-id: d2ad1bf3f2 [formerly f9b86f97e0] [formerly d2ad1bf3f2 [formerly f9b86f97e0] [formerly c64f0b2558 [formerly 347b9555cfe67ee5643b92bd84afbd1e2899acd7]]]
Former-commit-id: c64f0b2558
Former-commit-id: 57907af1e8 [formerly 59485dbac7]
Former-commit-id: af4b4c326b
|
2014-03-20 14:19:17 -05:00 |
|
Ben Steffensmeier
|
49ebe73b07
|
Issue #2791 fix NaN handling of smoothed contours.
Former-commit-id: b9cbe28411 [formerly 76fcfe163e] [formerly b9cbe28411 [formerly 76fcfe163e] [formerly c5aac15437 [formerly a6f8a0bd2758008997555e08ea7245517535b1db]]]
Former-commit-id: c5aac15437
Former-commit-id: 133767ff26 [formerly a9ee8b9b2f]
Former-commit-id: 466ce63273
|
2014-03-20 13:34:52 -05:00 |
|
Ben Steffensmeier
|
166f571c84
|
Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image.
Former-commit-id: ff0dfb0b11 [formerly 286f447a9c] [formerly ff0dfb0b11 [formerly 286f447a9c] [formerly 14af3282cb [formerly db3ffd586611ea8692728ea0de5451cec89421b6]]]
Former-commit-id: 14af3282cb
Former-commit-id: 4fbe62066a [formerly 48dac44df4]
Former-commit-id: bb39a48e5b
|
2014-03-20 13:31:08 -05:00 |
|
Brad Gonzales
|
412262edcf
|
Issue #2873 Removed 32 bit native libraries and references.
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f
Former-commit-id: de508133ff [formerly 08dde4824f] [formerly de508133ff [formerly 08dde4824f] [formerly 189234f162 [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]]
Former-commit-id: 189234f162
Former-commit-id: 0022633626 [formerly d303662a51]
Former-commit-id: f859a625d0
|
2014-03-20 13:27:39 -05:00 |
|
Lee Venable
|
bf055bee25
|
Issue #2925 - added runAsync dispose checks.
Change-Id: I4048f4b4ae8976d93b1bee89179be527ee3139e5
Former-commit-id: 43cfdc587a [formerly 112f7a886e] [formerly 43cfdc587a [formerly 112f7a886e] [formerly 397cb233d4 [formerly 2ebffdcfca606309daa3ed587f696a95af0b094e]]]
Former-commit-id: 397cb233d4
Former-commit-id: 30f7cac193 [formerly 2a6f9e8a85]
Former-commit-id: 60f93fef09
|
2014-03-20 13:09:17 -05:00 |
|
Mike Duff
|
ab451ac799
|
Issue #2857 - Implement Redbook NCO NDM menus
Change-Id: I93e9f21e8b7e797affe1e52c7baef0217433460b
Former-commit-id: 645e16792e [formerly c67f9c4be2] [formerly 645e16792e [formerly c67f9c4be2] [formerly 4ec18a8178 [formerly 2ddd856c9297a782340dc0fb9db2a9d36048f760]]]
Former-commit-id: 4ec18a8178
Former-commit-id: 80855b8e08 [formerly a624cd8053]
Former-commit-id: bb07313742
|
2014-03-20 11:24:48 -05:00 |
|
Mike Duff
|
df31189a39
|
Issue #2856 - Implement Redbook CPC ndm menus
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693
Former-commit-id: cdee2df27f [formerly 25c8a0a8aa] [formerly cdee2df27f [formerly 25c8a0a8aa] [formerly 40319e5fcf [formerly 8d9935cbee365c4a8537da610c2aff4d95c50f40]]]
Former-commit-id: 40319e5fcf
Former-commit-id: af9f9ba2c8 [formerly 09be0ef28d]
Former-commit-id: 9335ae821e
|
2014-03-20 11:16:35 -05:00 |
|
Mike Duff
|
580af4bdeb
|
Issue #2859 - Implement redbook MPC NDM menus
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e
Former-commit-id: 4be30fdc5b [formerly 059ac9c52a] [formerly 4be30fdc5b [formerly 059ac9c52a] [formerly e479bd7055 [formerly 619efadc2230af13707f124534d3caf2fdfaba68]]]
Former-commit-id: e479bd7055
Former-commit-id: 0b94340d7e [formerly bb07c57f3e]
Former-commit-id: c67dacabf5
|
2014-03-19 14:40:00 -05:00 |
|
Lee Venable
|
c59ab27cd4
|
Merge "Issue #2433 - Implement view by priority check box menus review comments" into development
Former-commit-id: 12aa173989 [formerly 96ea26a9a2] [formerly 12aa173989 [formerly 96ea26a9a2] [formerly ab3de987b4 [formerly 27cb84fc6629e94927a4e80cba9586df20805b0a]]]
Former-commit-id: ab3de987b4
Former-commit-id: 4ed1e7327e [formerly 9784b3737e]
Former-commit-id: 51234efbbb
|
2014-03-19 08:54:39 -05:00 |
|
Nate Jensen
|
6d25649178
|
Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development
Former-commit-id: bc9f494604 [formerly 3ee42187e6] [formerly bc9f494604 [formerly 3ee42187e6] [formerly d44fee0588 [formerly ad4deae1563ea5f311c3428cefb82bf156392310]]]
Former-commit-id: d44fee0588
Former-commit-id: 116c66b685 [formerly 99643d9545]
Former-commit-id: beeabfec37
|
2014-03-18 17:01:44 -05:00 |
|
Mike Duff
|
ae25f4e867
|
Issue #2433 - Implement view by priority check box menus
review comments
Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7
Former-commit-id: 9d24291927 [formerly a7e568e799] [formerly 9d24291927 [formerly a7e568e799] [formerly 202a822384 [formerly ca228b57089101c61f9d3f76d7edc4ba96c41b61]]]
Former-commit-id: 202a822384
Former-commit-id: b0554f903f [formerly 980e398584]
Former-commit-id: 43744f0255
|
2014-03-18 16:42:58 -05:00 |
|
Nate Jensen
|
e25dd853df
|
Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
Former-commit-id: 61c5a25407 [formerly 85e3ac041a] [formerly 61c5a25407 [formerly 85e3ac041a] [formerly 7e7745cd7b [formerly 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393]]]
Former-commit-id: 7e7745cd7b
Former-commit-id: e3bc322d49 [formerly 3e32812f13]
Former-commit-id: f823e46676
|
2014-03-18 13:13:53 -05:00 |
|
Nate Jensen
|
1125203c93
|
Issue #2895 fixed telestration when leadership returns to a previous
leader
Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033
Former-commit-id: 68b60eba47 [formerly e75d3dfb7c] [formerly 68b60eba47 [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 8589374171 [formerly ca1ec93450]
Former-commit-id: 5cb38bd511
|
2014-03-18 12:52:01 -05:00 |
|
Nate Jensen
|
19a66e94b9
|
Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development
Former-commit-id: b5f2064207 [formerly 5f79ece006] [formerly b5f2064207 [formerly 5f79ece006] [formerly e9be36b08c [formerly 1c87269eac595b61cc54c1e39ec8624ba55fd6d8]]]
Former-commit-id: e9be36b08c
Former-commit-id: 8ebc031a07 [formerly a4728542c5]
Former-commit-id: 4483a54b05
|
2014-03-18 12:38:48 -05:00 |
|
Mike Duff
|
179082ebf9
|
Issue #2798 - Fix issue with color not changing for existing user changing site.
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57
Former-commit-id: ac65a87fe5 [formerly 3d10260065] [formerly ac65a87fe5 [formerly 3d10260065] [formerly 7bdef60a55 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]]
Former-commit-id: 7bdef60a55
Former-commit-id: 1a3e88c5da [formerly 5bbe504f82]
Former-commit-id: b560f16623
|
2014-03-18 11:55:00 -05:00 |
|
Mike Duff
|
397af6e36e
|
Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
Peer review comments
Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef
Former-commit-id: 26866f4d73 [formerly 105a11d8f9] [formerly 26866f4d73 [formerly 105a11d8f9] [formerly cb6a3e2cf5 [formerly 29a88687a788305be537ef97cce13e3f45338205]]]
Former-commit-id: cb6a3e2cf5
Former-commit-id: ae979e09f5 [formerly d98f4b2ab0]
Former-commit-id: ef7847bc14
|
2014-03-18 11:32:28 -05:00 |
|
Nate Jensen
|
f609b46ec5
|
Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development
Former-commit-id: 3d7de2ad9a [formerly 6ddf9a2ee7] [formerly 3d7de2ad9a [formerly 6ddf9a2ee7] [formerly 6148c00ed2 [formerly 5b287c87e27e77b07b2f72030bf9e23c72e50912]]]
Former-commit-id: 6148c00ed2
Former-commit-id: d2fbbdc147 [formerly e77738ef65]
Former-commit-id: c363fc886c
|
2014-03-18 09:20:16 -05:00 |
|
Steve Harris
|
a936941dff
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 5efb16fa8b [formerly d0aeb854f5] [formerly 5efb16fa8b [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 5d95d594f8 [formerly b5a2d2237f]
Former-commit-id: 3a82fa7ac6
|
2014-03-17 15:55:41 -05:00 |
|
Steve Harris
|
a612c4e6dd
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 951c9b0d31 [formerly d087c8c31e] [formerly 951c9b0d31 [formerly d087c8c31e] [formerly 24fe6a248f [formerly 543090e28936ce680e21cda802cfac73ff31ca58]]]
Former-commit-id: 24fe6a248f
Former-commit-id: 5abea804af [formerly f878fe8729]
Former-commit-id: 6cc8f3a295
|
2014-03-17 15:53:31 -05:00 |
|
Nate Jensen
|
0014f6142f
|
Issue #2908 attempt to fix build
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480
Former-commit-id: b5f3aee368 [formerly 78afc6040c] [formerly b5f3aee368 [formerly 78afc6040c] [formerly 9cf43e7de6 [formerly 131d45e260ab446e9764d0fcc1f542ef012ff352]]]
Former-commit-id: 9cf43e7de6
Former-commit-id: cf171e67ed [formerly d4596770ee]
Former-commit-id: c6db5c24b1
|
2014-03-14 14:14:37 -05:00 |
|
Brian.Dyke
|
92ed2895fb
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 24a63fb05a [formerly 030a18f804] [formerly 24a63fb05a [formerly 030a18f804] [formerly 30084d7f84 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]
Former-commit-id: 30084d7f84
Former-commit-id: 916fec5a4f [formerly 2109409b24]
Former-commit-id: f20020876a
|
2014-03-14 10:15:53 -04:00 |
|
Brian.Dyke
|
516ba8e81a
|
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: 4e3096631d [formerly d4b6d22ae2] [formerly 4e3096631d [formerly d4b6d22ae2] [formerly f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]
Former-commit-id: f999e48df0
Former-commit-id: 82756e3855 [formerly 3ab2df3507]
Former-commit-id: 76271269c5
|
2014-03-14 08:44:39 -04:00 |
|
Bryan Kowal
|
a099c8d647
|
Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
Former-commit-id: 3e90c26b14 [formerly 9b2af366c1] [formerly 3e90c26b14 [formerly 9b2af366c1] [formerly 6ba13b2b44 [formerly 5f0d983aa7cd428d532aa3b418eaddf21e31718a]]]
Former-commit-id: 6ba13b2b44
Former-commit-id: f0ff052afc [formerly 2b053a3bc8]
Former-commit-id: 9cfde0458f
|
2014-03-13 17:39:32 -05:00 |
|
Kevin P. Johnson
|
90a9e642e3
|
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: e3a951da78 [formerly b2797a0788] [formerly e3a951da78 [formerly b2797a0788] [formerly 4c833d3389 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]
Former-commit-id: 4c833d3389
Former-commit-id: 32b372db4b [formerly 17a4229072]
Former-commit-id: eb12ec9c14
|
2014-03-13 20:42:12 +00:00 |
|