Commit graph

3451 commits

Author SHA1 Message Date
Greg Armendariz
65b70ce223 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72]
Former-commit-id: fc6195bbf6
2013-08-07 14:46:30 -05:00
Greg Armendariz
434c5fe208 Merge "Issue #2190 attempt to fix build" into development
Former-commit-id: cbd270b486 [formerly 430dd1bb43] [formerly 52b95b4809b76f5cf5347da449d048097282c0e1 [formerly 614a9a5ca0]] [formerly c588a5ce7e [formerly 614a9a5ca0 [formerly 3cf79c8f9e9391b4bac3d6dba05570eb9a1cedfc]]]
Former-commit-id: c588a5ce7e
Former-commit-id: 83f5a45605cf9e00f0e0b71e61536e678ce5fb8b [formerly 8c8439446a]
Former-commit-id: 85b41d68d1
2013-08-07 14:41:37 -05:00
Nate Jensen
ae9d10af53 Issue #2190 attempt to fix build
Change-Id: I733289250b318c81134bacb676837b36b67fb6c6

Former-commit-id: 6cade095f9 [formerly 88cefe228a] [formerly f56bb10cb2] [formerly d1e2274f46 [formerly f56bb10cb2 [formerly 9e6ca01815f880282ec87fdce72d108131039f2e]]]
Former-commit-id: d1e2274f46
Former-commit-id: ebf4b1c6040bb679265b692cf1876a32c85b647d [formerly 8478d68a56]
Former-commit-id: 2ceeb152ba
2013-08-07 14:15:50 -05:00
Ron Anderson
441702e186 Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 17ed074c5e [formerly 896b5333d1] [formerly 216b2a5c86] [formerly 0a9068e6d3 [formerly 216b2a5c86 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]]
Former-commit-id: 0a9068e6d3
Former-commit-id: 72056a95440f5bfa6c34f417686f4cf38ac5b799 [formerly fcb78e78d3]
Former-commit-id: 44c10c798d
2013-08-07 14:05:36 -05:00
Greg Armendariz
4c20fc4977 13.5.1-11 baseline
Former-commit-id: 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]
Former-commit-id: 4ec04083bd
Former-commit-id: f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb]
Former-commit-id: 75f9f8df3f
2013-08-07 14:34:27 -04:00
Greg Armendariz
690ea2e228 13.5.1-10 baseline
Former-commit-id: 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly acf7ced37b [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]
Former-commit-id: acf7ced37b
Former-commit-id: 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88]
Former-commit-id: 9ddb32967c
2013-08-07 14:14:46 -04:00
Nate Jensen
071380df2d Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: 86d32ce3e0 [formerly 04e78d5a64] [formerly cdfea29b16] [formerly 5c7dc36583 [formerly cdfea29b16 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]]
Former-commit-id: 5c7dc36583
Former-commit-id: c8ded44555418c15296b5bf17e62b4980ac6d12e [formerly d520081243]
Former-commit-id: e99fd427ec
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
6d60a18a2d Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly b06171b4f2 [formerly f0ceddacf1 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]
Former-commit-id: b06171b4f2
Former-commit-id: 638ab88007fb4ccfc259d1c8e3cfadd1bdb30ab1 [formerly 3eb869c65e]
Former-commit-id: 7de39a58bb
2013-08-07 12:08:13 -05:00
Ben Steffensmeier
4a92feba62 Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c

Former-commit-id: fb3a11161a [formerly f9cd8457bc] [formerly 2ecba23bb9] [formerly 2a51ddd697 [formerly 2ecba23bb9 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]]
Former-commit-id: 2a51ddd697
Former-commit-id: 77c845fde31945d0fea149cfd3d18a9817475c57 [formerly 15ddd45995]
Former-commit-id: 794d41a8f7
2013-08-06 18:27:21 -05:00
Nate Jensen
9c6c35e033 Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 27dd27a73f [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 5da0c0771f6b8cf3997cc0c8fb770658e04f2445 [formerly 15006517a2]
Former-commit-id: 04d55ac1c0
2013-08-06 17:17:53 -05:00
Richard Peter
2d6d983e5e Merge "Issue #2142 fix logback ingest config" into development
Former-commit-id: 47ccb5664c [formerly 91bef56489] [formerly a229fd3abb] [formerly 883f450f28 [formerly a229fd3abb [formerly 3deb3b03c2ab71ce00b1bf465bae6139e462c39e]]]
Former-commit-id: 883f450f28
Former-commit-id: eb0599c9a3d5d84873578ef41866b54b2ea192d9 [formerly d75818c241]
Former-commit-id: 52d44a496e
2013-08-06 14:23:41 -05:00
Nate Jensen
d9c89f8bb9 Issue #2142 fix logback ingest config
Change-Id: I7b50e76bea11eff68cc29930faa1cd1443558a70

Former-commit-id: 3cbbe0c45e [formerly 7aecba7abe] [formerly f756c0039a] [formerly ac3071cc0a [formerly f756c0039a [formerly f191176549581689ac20b62a2033c19264aaa8df]]]
Former-commit-id: ac3071cc0a
Former-commit-id: d9c941a6af8ad27f53271c1a2f0680929ecfdfec [formerly b50304a16f]
Former-commit-id: 83e9df5281
2013-08-06 14:22:15 -05:00
Richard Peter
0a5d8013e1 Merge "Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup" into development
Former-commit-id: 4158d57607 [formerly d6ac029070] [formerly 6eb59502f8] [formerly a91d535a99 [formerly 6eb59502f8 [formerly 14e07542613348b91e60baa914cdffe1b936d9d7]]]
Former-commit-id: a91d535a99
Former-commit-id: 41f990e3501baf98e41534e615878951c611f1dd [formerly 6fb0e514f5]
Former-commit-id: 3e07f1af5a
2013-08-06 14:21:53 -05:00
Nate Jensen
4fe731ccdb Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
Former-commit-id: 746a96fd40 [formerly fb6b9a8b42] [formerly 0bf9eed643] [formerly e7949c04ad [formerly 0bf9eed643 [formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]]
Former-commit-id: e7949c04ad
Former-commit-id: ff0fd5a9b04f0b8a202951409f834a7e581a8e3e [formerly 2bd358ff19]
Former-commit-id: a321310dd8
2013-08-06 14:14:27 -05:00
Richard Peter
fda76ba0ee Merge "Issue #2221 - Changes to have select configuration files for retention and case creation." into development
Former-commit-id: d6daa8baf3 [formerly 87ecd93a4b] [formerly d6041529db] [formerly 301556213a [formerly d6041529db [formerly 99422acbda91c8f499af9c4ae57b136a1469fdfa]]]
Former-commit-id: 301556213a
Former-commit-id: 1593a636ef6ed60894e574a47d06015f69c4d8a7 [formerly 5349f48a34]
Former-commit-id: 9909443fdb
2013-08-06 12:46:32 -05:00
Max Schenkelberg
b5b121032d Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage
Amend: Added jgerth comment history back in

Change-Id: I08733fcf46f9bdcded1f609bcdd26459652edaef

Former-commit-id: 9d590ce7f9 [formerly 7f4b63283d] [formerly dda69d36b7] [formerly a18686135c [formerly dda69d36b7 [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]
Former-commit-id: a18686135c
Former-commit-id: 627430677d858453f22a1a0fc99838be1d3e97bc [formerly 75ae62fd9a]
Former-commit-id: 23b6e68e14
2013-08-06 12:37:52 -05:00
Nate Jensen
38bba7e251 Issue #2142 fix logback config
Change-Id: I6e708cb251f6e4564ede0ba90f2cd906eb16a998

Former-commit-id: 2c4734ce54 [formerly ef55df925d] [formerly 05eba98d50] [formerly 148153eddf [formerly 05eba98d50 [formerly a200e86f382e532c1b60c907b4a0b00d80688917]]]
Former-commit-id: 148153eddf
Former-commit-id: 80b6539a62386b3c8373852e2c99db585c1158d0 [formerly b04d075d18]
Former-commit-id: 119368aec0
2013-08-06 11:39:34 -05:00
Benjamin Phillippe
a3b8e6ff24 Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56

Former-commit-id: 065a80e21f [formerly 01466d0624] [formerly 73fd5ac852] [formerly 5bd0d92363 [formerly 73fd5ac852 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]]
Former-commit-id: 5bd0d92363
Former-commit-id: 797d497319dc73d802f575a9b6766863f551e648 [formerly 33f601b72e]
Former-commit-id: 972d02114c
2013-08-06 11:13:01 -05:00
Richard Peter
e95db3f09a Merge "Issue #2228 use TMemoryInputTransport for slight efficiency improvement" into development
Former-commit-id: 329f6f394a [formerly fd739709d5] [formerly 7a1c02eac8] [formerly a6cccde03f [formerly 7a1c02eac8 [formerly 1fe04ca5037355f11d0deab7ebcc27b84e0a337b]]]
Former-commit-id: a6cccde03f
Former-commit-id: 31af48dbbdefe0626257ed97c479cdeb27b4b7ec [formerly fdcb9d2070]
Former-commit-id: 4d11d1bed2
2013-08-06 10:09:50 -05:00
Nate Jensen
3f73444553 Merge "Issue #1726 change how swt is imported to tests" into development
Former-commit-id: c11be94cfd [formerly fe50df0d72] [formerly 35ec9bb413] [formerly 730f0d7f78 [formerly 35ec9bb413 [formerly 47f5fbe957aedbf7edbc9b45fd9774fb73fa1c9f]]]
Former-commit-id: 730f0d7f78
Former-commit-id: acad7c9e1eacf5c90be04cbb70e05399abf71dd9 [formerly 6f61e57845]
Former-commit-id: a23cc7344c
2013-08-06 09:57:44 -05:00
Nate Jensen
3d38129cff Issue #2228 use TMemoryInputTransport for slight efficiency improvement
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf

Former-commit-id: 4285a532f2 [formerly 963119e0f3] [formerly d4590cbf5e] [formerly 842f15ae12 [formerly d4590cbf5e [formerly 3f3afa1fe36da04ce47b9af1e8bd34746b75e68f]]]
Former-commit-id: 842f15ae12
Former-commit-id: 7f5e7fbcbc7f70e4221c8002d8b026234f9f46b9 [formerly 7d17d965a3]
Former-commit-id: 584a17828a
2013-08-06 09:52:02 -05:00
Matt Nash
ff2e86df26 Issue #1726 change how swt is imported to tests
Change-Id: I72ad8b22c0f55eded1548dc664a6c8fe05ff11cc

Former-commit-id: a1e4191255 [formerly bf0fc07a89] [formerly 0e0504f9fe] [formerly 1e42d0b7a6 [formerly 0e0504f9fe [formerly 78606bdbbde14383b3b12e4d72772dc6a8d1a21b]]]
Former-commit-id: 1e42d0b7a6
Former-commit-id: 684cf762a7afeaa8e71ec291e6969f267747f4ae [formerly 80064a389f]
Former-commit-id: b1204865d2
2013-08-06 09:44:47 -05:00
Lee Venable
132a348b01 Merge "Issue #2143. Changes for non-blocking SCAN dialogs." into development
Former-commit-id: c0e389a4c4 [formerly 89e05a8de1] [formerly a2ae8fe5de] [formerly 2a74881571 [formerly a2ae8fe5de [formerly 8a893db2a506ade83e6cd22355893138c32cdfea]]]
Former-commit-id: 2a74881571
Former-commit-id: 4bb4be0c1640a38f3302cc6d5c848ed37cf6cfd9 [formerly 8f0fa192bb]
Former-commit-id: 3e098ce4f4
2013-08-06 09:32:21 -05:00
Nate Jensen
8c28596209 Merge "Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source." into development
Former-commit-id: 279472e0d7 [formerly 2319a713ce] [formerly fcb6f59a3f] [formerly 28ffe0f3f1 [formerly fcb6f59a3f [formerly 48e80dd9732e0b20f211fa456c8bec81b4495555]]]
Former-commit-id: 28ffe0f3f1
Former-commit-id: 7511beab68aac9774e97faec81dcd3682d5dae36 [formerly 51ce39012d]
Former-commit-id: 5c078cd52b
2013-08-06 08:35:50 -05:00
Max Schenkelberg
ebafa449b2 Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source.
Amend: Fixed println, added uncustomization of displays to interface, fixed font issue
Amend: Fixed comments and switched to TimeUtil for common constants for time

Change-Id: I92b49a59848ee4a8f61205ab21f5de2e0c260525

Former-commit-id: 7d88c2a719 [formerly 54fe14b06b] [formerly 474429aaee] [formerly f08e2d5edc [formerly 474429aaee [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]]
Former-commit-id: f08e2d5edc
Former-commit-id: 2a67c02053abdfe27ab400dab9e694161c2fd5f6 [formerly fc60d55637]
Former-commit-id: 541c66a894
2013-08-05 16:46:02 -05:00
Roger Ferrel
7762c691f4 Issue #2221 - Changes to have select configuration files for retention and case creation.
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f

Former-commit-id: 1b1f1e5fcd [formerly 7ec3980efb] [formerly 19d23ae929] [formerly b3f9ea79af [formerly 19d23ae929 [formerly 30f55459d26e3d1118610959e98e475ede0e9f47]]]
Former-commit-id: b3f9ea79af
Former-commit-id: dc9bcea79d50c494391552aab4788f40fc1d371c [formerly 2be8799f51]
Former-commit-id: 1989010d06
2013-08-05 16:20:46 -05:00
Richard Peter
858be1c9ac Merge "Issue #2220 Removed synchronized from most methods." into development
Former-commit-id: 89894b6f7d [formerly e0194aa022] [formerly d79c7c1b84] [formerly 084d39c6f3 [formerly d79c7c1b84 [formerly 5d93f17fc5fcb0cd98e5b4bf3681fc9bc244b993]]]
Former-commit-id: 084d39c6f3
Former-commit-id: 7c8d8d740241500fd1596cf042c785f1d1a49abd [formerly b23a59a114]
Former-commit-id: 05aac96abd
2013-08-05 14:27:33 -05:00
Nate Jensen
a0880acbcc Merge "Issue #1726 change how swt is imported to tests, uncomment some tests that now work again" into development
Former-commit-id: 157edfcb76 [formerly 724db0f3ef] [formerly e1ef074936] [formerly d74a7639ba [formerly e1ef074936 [formerly c1b8ad9acaa8a5f5397c833a9edb5db23eaa5981]]]
Former-commit-id: d74a7639ba
Former-commit-id: c5d4a8d0d894566ff80f64cd36737646d58888ff [formerly eb0ccfe92f]
Former-commit-id: 510b70744d
2013-08-05 12:45:29 -05:00
Matt Nash
c7e2a458d6 Issue #1726 change how swt is imported to tests, uncomment some tests that now work again
Change-Id: Ib671f3240660368631483713e9619c836599fec4

Former-commit-id: 472b1bf04f [formerly 14c32d882c] [formerly ca8fcf84e5] [formerly ba5cacb5e5 [formerly ca8fcf84e5 [formerly a69fe2bc71ea77e941c9e20bfbc01d9c74ba94c7]]]
Former-commit-id: ba5cacb5e5
Former-commit-id: 3efe4a784168aeb58039f98d462587155a4eb17e [formerly 09b2a2a8a6]
Former-commit-id: 33d37db782
2013-08-05 12:13:15 -05:00
Nate Jensen
de1403cea2 Merge "Issue #2202 Add edex specific connectivity checking. Change-Id: I003957001ed608d1054ab2a87019b018f8996d36" into development
Former-commit-id: b06d7f1843 [formerly a28827953e] [formerly b7e69cfcd5] [formerly 21b0a2b103 [formerly b7e69cfcd5 [formerly 1c314409369402473812c954821e0d47a4e05183]]]
Former-commit-id: 21b0a2b103
Former-commit-id: 5de7cc16231ad7eca899859678048265f064b215 [formerly 159e35d87e]
Former-commit-id: 08e3b40e4b
2013-08-05 11:38:02 -05:00
Ben Steffensmeier
0b22fe9da3 Issue #2202 Add edex specific connectivity checking.
Change-Id: I003957001ed608d1054ab2a87019b018f8996d36

Former-commit-id: 8eb1bf8c88 [formerly 54321b4839] [formerly cfd9cb0b7d] [formerly fac4cdc131 [formerly cfd9cb0b7d [formerly b8e5323b70db03817c6c750746f29cc550cbc815]]]
Former-commit-id: fac4cdc131
Former-commit-id: a127f5eb4b93131c2c55736067e9343cd59ea445 [formerly 66ce1a9c68]
Former-commit-id: b7e7e69acd
2013-08-05 11:17:23 -05:00
Richard Peter
8b342df320 Merge "Issue #2057 Added support for marking obsolete databases for later removal." into development
Former-commit-id: 0bad46b054 [formerly c43cdaeb76] [formerly af826f283b] [formerly f964cc3e65 [formerly af826f283b [formerly 5e67c228fea2f719bfb0561132701097bf785a80]]]
Former-commit-id: f964cc3e65
Former-commit-id: 04faa56f3d06a21a1153f3ddf213d4a2e546ce64 [formerly 9a6015efcb]
Former-commit-id: 0d69b079ee
2013-08-05 09:51:14 -05:00
Greg Armendariz
9b38aaf278 Issue #2191 - Fix build
Former-commit-id: 816af50f59 [formerly 951aea1539] [formerly 0033adf062] [formerly f5a2245c51 [formerly 0033adf062 [formerly c7b8b6aaf43fd3ed1d73be7ceed8b002a0325205]]]
Former-commit-id: f5a2245c51
Former-commit-id: 1ab46689e197b8af0c8037223ac6539bbb3bb515 [formerly a7d1d0ae75]
Former-commit-id: 7f7c8cfb34
2013-08-04 08:35:51 -05:00
Richard Peter
4b028df1b9 Merge "Issue #2191 Registry federation synchronization and garbage collection" into development
Former-commit-id: 7c26c9e7a6 [formerly 22f8248332] [formerly e692cc245b] [formerly 137bb556ee [formerly e692cc245b [formerly 4e3f429e5aebec59e5c15c8bea062cc62e599cc6]]]
Former-commit-id: 137bb556ee
Former-commit-id: a312d2291318cf1c45a4d559b0f1771bde29cc02 [formerly 549ffd000c]
Former-commit-id: f348aadcd4
2013-08-02 14:44:16 -05:00
Slav Korolev
f408b65809 Issue #2143. Changes for non-blocking SCAN dialogs.
Change-Id: I0afcaced20e0cc76cbcb2d64a24fcfc3022dc1d1

Former-commit-id: 2a16bc5f53 [formerly e8a828d675] [formerly 0c0941ad5d] [formerly 4afde7addb [formerly 0c0941ad5d [formerly 5539da3d19fa0c174eba1a8733e946ca10e5f4bb]]]
Former-commit-id: 4afde7addb
Former-commit-id: ce5f78fe83637b3d4ba5583f6fd0665e41908b2a [formerly 5d180b2e58]
Former-commit-id: 94150381c5
2013-08-02 09:53:56 -04:00
Dave Hladky
cfe858f81c Issue #2236 Fixed P2 build
Former-commit-id: f0c6a35fa2 [formerly 0e9115ddc1] [formerly 2c33f301df] [formerly 08f1021c6d [formerly 2c33f301df [formerly 8f2fa18da2ee547882773075be229c223b2a48ec]]]
Former-commit-id: 08f1021c6d
Former-commit-id: a3165355347e292af0aec35c177a1769e23e8e2d [formerly dd3e466992]
Former-commit-id: ec70da42b6
2013-08-01 14:40:06 -05:00
Roger Ferrel
1145ef4b82 Issue #2220 Removed synchronized from most methods.
Change-Id: I863fd9017e53212b1cdf926ae32a163e2d327858

Former-commit-id: 357f17f656 [formerly 825ef1aa02] [formerly 4cdb105622] [formerly 1a66522590 [formerly 4cdb105622 [formerly 6857a74daf7ac43aa76715aff31dfbed04ff0b0b]]]
Former-commit-id: 1a66522590
Former-commit-id: 597c6decdc07227bd984e1670473cf4ae6c8307f [formerly 51b36a0612]
Former-commit-id: 80905446a3
2013-08-01 13:46:21 -05:00
Greg Armendariz
6ddd51b399 Merge "Issue #2213 - create the primary and backup exportgrids directories for GFESuite" into development
Former-commit-id: ce959fa0bb [formerly 5d312802d3] [formerly 6fc06bb4e4] [formerly f6f9b823d8 [formerly 6fc06bb4e4 [formerly 86902fe016dd65446e74c405a93ba0142affc9a4]]]
Former-commit-id: f6f9b823d8
Former-commit-id: 85a0802f8cfe8e28f9d7016efb1815fe998a3e93 [formerly 8afd882a55]
Former-commit-id: 0d137cd803
2013-08-01 13:29:26 -05:00
Steve Harris
e680a0e630 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 3573599aaf [formerly 1917c598bc] [formerly 72893066cc] [formerly 97ef150656 [formerly 72893066cc [formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]]
Former-commit-id: 97ef150656
Former-commit-id: 2b8530d5516361d757800e54b2cc11d91e3b78b4 [formerly b346666ef1]
Former-commit-id: 6ec0c65e84
2013-08-01 08:27:10 -05:00
Steve Harris
7fc384a659 13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]
Former-commit-id: c7e7c838aa
2013-08-01 09:20:23 -04:00
Ron Anderson
4c2e248897 Issue #2057 Added support for marking obsolete databases for later removal.
Change-Id: Ie1859e08c7a0305f3ea7bc82e726dd8ba1658b1a

Former-commit-id: 54c09d83c9 [formerly fa3640fb11] [formerly b84a946f86] [formerly 2a0c77eb5c [formerly b84a946f86 [formerly db55eb737e5b7a82dec8f585eabda455717321a2]]]
Former-commit-id: 2a0c77eb5c
Former-commit-id: be348fb8b5aa3bf05312f7ba0bbea72ba9aa1a18 [formerly f54129bbda]
Former-commit-id: 4b2660c2c4
2013-07-31 17:38:09 -05:00
Richard Peter
5a17933d7c Merge "Issue #2236 Merged Mike's Code" into development
Former-commit-id: 0dfe865802 [formerly 655ec4521d] [formerly 733c4806e8] [formerly 563abed925 [formerly 733c4806e8 [formerly 837c11d7cb97b36751b37c4468ff00b0e261b870]]]
Former-commit-id: 563abed925
Former-commit-id: 32c1296f69d83909b78a2ce694ecbc2805d9d5f7 [formerly 6a6ccaf622]
Former-commit-id: c492ced15d
2013-07-31 16:33:01 -05:00
Richard Peter
8c3f59f511 Merge "Issue #2220 Implement Archive GUI's recompute sizes." into development
Former-commit-id: 1f1f73e801 [formerly f3a57e9237] [formerly 9acfea6525] [formerly d1fa0bb7c8 [formerly 9acfea6525 [formerly 080503d71a2b4e40f8ef7985ef01142c2fa29ce0]]]
Former-commit-id: d1fa0bb7c8
Former-commit-id: 5eaa7bfb85ebf386953a48101c99b3c372ec2162 [formerly fe0573a141]
Former-commit-id: 3796a1ab40
2013-07-31 16:31:24 -05:00
Lee Venable
67546ceaff Merge "Issue #2227 fix weird swapping behavior on 4 panel" into development
Former-commit-id: df5c079ae8 [formerly 68018b239c] [formerly c1c97f0a72] [formerly c0d3ef6e8c [formerly c1c97f0a72 [formerly 8313addc8b417aa769264f95f2b22fd65426e88d]]]
Former-commit-id: c0d3ef6e8c
Former-commit-id: 3521c179cc7ac46f52fa5d1fa67d4d4609930681 [formerly 016cd9a487]
Former-commit-id: a468f3b5db
2013-07-31 16:29:55 -05:00
Dave Hladky
be1b52c989 Issue #2236 Merged Mike's Code
Change-Id: I78943ceee3aeea1eeb6d815fefd3e82b46d677a6

Former-commit-id: 78766d5567 [formerly 2049a9b4da] [formerly e21cc84d16] [formerly db7c81a1df [formerly e21cc84d16 [formerly 7cc09247bc4166f9586867fba097b4c40577464d]]]
Former-commit-id: db7c81a1df
Former-commit-id: 3c1f19617df625bcf1fc232516da55cda0f42bfc [formerly fe9e969142]
Former-commit-id: fef2b39123
2013-07-31 16:16:47 -05:00
Matt Nash
1f94d7806c Issue #2227 fix weird swapping behavior on 4 panel
Change-Id: I87c35349e7aa6b91974f2c8f5edf2531d72a806f

Former-commit-id: 11461bb3f0 [formerly 31f450ccd8] [formerly 341138f01c] [formerly a4b4177199 [formerly 341138f01c [formerly 83eaaa8e7635c15905f2028dd9f91425bc54826f]]]
Former-commit-id: a4b4177199
Former-commit-id: fd238b22e28bc7992878216af6a4422a72226198 [formerly 7092cd385b]
Former-commit-id: cc05c64eac
2013-07-31 14:50:42 -05:00
Richard Peter
08f6dae69f Merge "Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes." into development
Former-commit-id: d0746350d7 [formerly 1a4c887b6f] [formerly 42248850a6] [formerly 6223ee42de [formerly 42248850a6 [formerly d85dd6c0b1c657bc2ff23c461370fbc480656229]]]
Former-commit-id: 6223ee42de
Former-commit-id: 64a9689355af15f6e09574ae0fe2b065b687f3bb [formerly eb0e4c9a70]
Former-commit-id: 5b3944835a
2013-07-31 13:40:49 -05:00
Richard Peter
7f46fbf78f Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly f97a27796d [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]
Former-commit-id: f97a27796d
Former-commit-id: ea1df038b44fa6b4c0db240a0fb0b45969d773c0 [formerly 3f1e17765a]
Former-commit-id: a67f0bf2da
2013-07-31 12:54:12 -05:00
Richard Peter
79f686a303 Merge "Issue #2180 encrypt credential storage" into development
Former-commit-id: 0c1b56e59c [formerly 9a7d566375] [formerly d97920b3dd] [formerly 85e1ff2f90 [formerly d97920b3dd [formerly ff2282377e18aee855e3029c82c6653cf3f4c9e5]]]
Former-commit-id: 85e1ff2f90
Former-commit-id: 964a0a8c2be8bab43e777cb05c0ab7790260aaa8 [formerly 8e14c9cd78]
Former-commit-id: c0f4788d5a
2013-07-31 11:40:22 -05:00
Bryan Kowal
4f9752d0ca Issue #2164 - fix 32-bit edex_com, edex_notify build
Change-Id: I04251c30fdba10d81940364056ba0f5478a56d30

Former-commit-id: 8570281fdf [formerly 420ffa0afd] [formerly 7aba70031d] [formerly 9b3f7977e5 [formerly 7aba70031d [formerly a170ba8c71f1713f801ee663baf59ea4bd206afe]]]
Former-commit-id: 9b3f7977e5
Former-commit-id: 852b7a810a929b5e6a8a0e3ec1975bcd75498da5 [formerly f1445e37a2]
Former-commit-id: ece1adb977
2013-07-31 11:34:00 -05:00