Commit graph

3555 commits

Author SHA1 Message Date
Max Schenkelberg
9edbaaf730 Issue #2190 removed non-existent .so from meteolib build.properties
Change-Id: I40ff45473518215375ace9fbdcd9a8e416ddb438

Former-commit-id: 48dd7a6ca7 [formerly f587206b84] [formerly 48dd7a6ca7 [formerly f587206b84] [formerly 7ed0b6c5f8 [formerly 006ea8d18d40c8fb147e4970a1032f0f6efa3cfc]]]
Former-commit-id: 7ed0b6c5f8
Former-commit-id: fbe0988682 [formerly 259f16578c]
Former-commit-id: 8157d99949
2013-08-08 09:15:05 -05:00
Ben Steffensmeier
7762410fa0 Issue #2077 Revise pixel size calculations.
Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7

Former-commit-id: 6e1c8c7208 [formerly 6c7d1d60a8] [formerly 6e1c8c7208 [formerly 6c7d1d60a8] [formerly 1bd7cc1097 [formerly 99fa66319bfe07aa84276bd7f9f0817ed5868798]]]
Former-commit-id: 1bd7cc1097
Former-commit-id: ffe256a0eb [formerly 3071e53e45]
Former-commit-id: 65e33fdae5
2013-08-07 18:40:28 -05:00
Ben Steffensmeier
2056116c16 Issue #2235 Fix the build, hopefully.
Change-Id: I09466023c4d15921bc9b86e2d6f0958c1ff83539

Former-commit-id: 49a2b27ab1 [formerly 95c4e2d65d] [formerly 49a2b27ab1 [formerly 95c4e2d65d] [formerly 4b705b1436 [formerly 1545f57a99f47bd8dabb70235914bdaa14025b00]]]
Former-commit-id: 4b705b1436
Former-commit-id: 1de459b743 [formerly cdddcac87b]
Former-commit-id: 2877836f4d
2013-08-07 17:15:06 -05:00
Nate Jensen
d6cbe9b4f5 Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: 8968389383 [formerly ec01e6e872] [formerly 8968389383 [formerly ec01e6e872] [formerly be9315642b [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]
Former-commit-id: be9315642b
Former-commit-id: 8cca3c32ac [formerly b0f3d536e4]
Former-commit-id: 9d4e00d5d1
2013-08-07 16:44:30 -05:00
Greg Armendariz
4b29a16298 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: d1fb06feb7 [formerly ecc9f77f42] [formerly d1fb06feb7 [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]
Former-commit-id: 6b1989cb29
Former-commit-id: fc6195bbf6 [formerly c46f04dd72]
Former-commit-id: 9a1b44efdc
2013-08-07 14:46:30 -05:00
Greg Armendariz
69c581a199 Merge "Issue #2190 attempt to fix build" into development
Former-commit-id: 430dd1bb43 [formerly 614a9a5ca0] [formerly 430dd1bb43 [formerly 614a9a5ca0] [formerly c588a5ce7e [formerly 3cf79c8f9e9391b4bac3d6dba05570eb9a1cedfc]]]
Former-commit-id: c588a5ce7e
Former-commit-id: 85b41d68d1 [formerly 8c8439446a]
Former-commit-id: 7c87d81235
2013-08-07 14:41:37 -05:00
Nate Jensen
37ce13f591 Issue #2190 attempt to fix build
Change-Id: I733289250b318c81134bacb676837b36b67fb6c6

Former-commit-id: 88cefe228a [formerly f56bb10cb2] [formerly 88cefe228a [formerly f56bb10cb2] [formerly d1e2274f46 [formerly 9e6ca01815f880282ec87fdce72d108131039f2e]]]
Former-commit-id: d1e2274f46
Former-commit-id: 2ceeb152ba [formerly 8478d68a56]
Former-commit-id: c69abb1d90
2013-08-07 14:15:50 -05:00
Ron Anderson
ec60977418 Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 896b5333d1 [formerly 216b2a5c86] [formerly 896b5333d1 [formerly 216b2a5c86] [formerly 0a9068e6d3 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]]
Former-commit-id: 0a9068e6d3
Former-commit-id: 44c10c798d [formerly fcb78e78d3]
Former-commit-id: f8ad742697
2013-08-07 14:05:36 -05:00
Greg Armendariz
8bf2c1cc07 13.5.1-11 baseline
Former-commit-id: c402dbf6e9 [formerly ea7b22500e] [formerly c402dbf6e9 [formerly ea7b22500e] [formerly 4ec04083bd [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 75f9f8df3f [formerly 26e58d8cdb]
Former-commit-id: f06ee47260
2013-08-07 14:34:27 -04:00
Greg Armendariz
5998f47f57 13.5.1-10 baseline
Former-commit-id: e276b0fabe [formerly 852455843f] [formerly e276b0fabe [formerly 852455843f] [formerly acf7ced37b [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]
Former-commit-id: acf7ced37b
Former-commit-id: 9ddb32967c [formerly 05282eac88]
Former-commit-id: f37ef8c24e
2013-08-07 14:14:46 -04:00
Nate Jensen
527da593d3 Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: 04e78d5a64 [formerly cdfea29b16] [formerly 04e78d5a64 [formerly cdfea29b16] [formerly 5c7dc36583 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]]
Former-commit-id: 5c7dc36583
Former-commit-id: e99fd427ec [formerly d520081243]
Former-commit-id: f8bd55d407
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
7a95a653aa Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: 74a5f09cd1 [formerly f0ceddacf1] [formerly 74a5f09cd1 [formerly f0ceddacf1] [formerly b06171b4f2 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]
Former-commit-id: b06171b4f2
Former-commit-id: 7de39a58bb [formerly 3eb869c65e]
Former-commit-id: 7e3835fd0a
2013-08-07 12:08:13 -05:00
Ben Steffensmeier
7a597c7223 Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c

Former-commit-id: f9cd8457bc [formerly 2ecba23bb9] [formerly f9cd8457bc [formerly 2ecba23bb9] [formerly 2a51ddd697 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]]
Former-commit-id: 2a51ddd697
Former-commit-id: 794d41a8f7 [formerly 15ddd45995]
Former-commit-id: 16c0832b4f
2013-08-06 18:27:21 -05:00
Nate Jensen
077c619bbf 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: 960dc1e81e [formerly a1a9a4751a] [formerly 960dc1e81e [formerly a1a9a4751a] [formerly 27dd27a73f [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 04d55ac1c0 [formerly 15006517a2]
Former-commit-id: 22861240c8
2013-08-06 17:17:53 -05:00
Richard Peter
ca511021e3 Merge "Issue #2142 fix logback ingest config" into development
Former-commit-id: 91bef56489 [formerly a229fd3abb] [formerly 91bef56489 [formerly a229fd3abb] [formerly 883f450f28 [formerly 3deb3b03c2ab71ce00b1bf465bae6139e462c39e]]]
Former-commit-id: 883f450f28
Former-commit-id: 52d44a496e [formerly d75818c241]
Former-commit-id: d8ef36a6f3
2013-08-06 14:23:41 -05:00
Nate Jensen
fc6a343ba5 Issue #2142 fix logback ingest config
Change-Id: I7b50e76bea11eff68cc29930faa1cd1443558a70

Former-commit-id: 7aecba7abe [formerly f756c0039a] [formerly 7aecba7abe [formerly f756c0039a] [formerly ac3071cc0a [formerly f191176549581689ac20b62a2033c19264aaa8df]]]
Former-commit-id: ac3071cc0a
Former-commit-id: 83e9df5281 [formerly b50304a16f]
Former-commit-id: 97cf1bb5bb
2013-08-06 14:22:15 -05:00
Richard Peter
85b333758b Merge "Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup" into development
Former-commit-id: d6ac029070 [formerly 6eb59502f8] [formerly d6ac029070 [formerly 6eb59502f8] [formerly a91d535a99 [formerly 14e07542613348b91e60baa914cdffe1b936d9d7]]]
Former-commit-id: a91d535a99
Former-commit-id: 3e07f1af5a [formerly 6fb0e514f5]
Former-commit-id: a082f83204
2013-08-06 14:21:53 -05:00
Nate Jensen
94d44a672a Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
Former-commit-id: fb6b9a8b42 [formerly 0bf9eed643] [formerly fb6b9a8b42 [formerly 0bf9eed643] [formerly e7949c04ad [formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]]
Former-commit-id: e7949c04ad
Former-commit-id: a321310dd8 [formerly 2bd358ff19]
Former-commit-id: 5c3310851b
2013-08-06 14:14:27 -05:00
Richard Peter
3e7e16a995 Merge "Issue #2221 - Changes to have select configuration files for retention and case creation." into development
Former-commit-id: 87ecd93a4b [formerly d6041529db] [formerly 87ecd93a4b [formerly d6041529db] [formerly 301556213a [formerly 99422acbda91c8f499af9c4ae57b136a1469fdfa]]]
Former-commit-id: 301556213a
Former-commit-id: 9909443fdb [formerly 5349f48a34]
Former-commit-id: cb58571e5f
2013-08-06 12:46:32 -05:00
Max Schenkelberg
a691c86dc0 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: 7f4b63283d [formerly dda69d36b7] [formerly 7f4b63283d [formerly dda69d36b7] [formerly a18686135c [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]
Former-commit-id: a18686135c
Former-commit-id: 23b6e68e14 [formerly 75ae62fd9a]
Former-commit-id: 3d5f35d792
2013-08-06 12:37:52 -05:00
Nate Jensen
c5c37c9646 Issue #2142 fix logback config
Change-Id: I6e708cb251f6e4564ede0ba90f2cd906eb16a998

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

Former-commit-id: 01466d0624 [formerly 73fd5ac852] [formerly 01466d0624 [formerly 73fd5ac852] [formerly 5bd0d92363 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]]
Former-commit-id: 5bd0d92363
Former-commit-id: 972d02114c [formerly 33f601b72e]
Former-commit-id: ce5cb744d8
2013-08-06 11:13:01 -05:00
Richard Peter
c64797d099 Merge "Issue #2228 use TMemoryInputTransport for slight efficiency improvement" into development
Former-commit-id: fd739709d5 [formerly 7a1c02eac8] [formerly fd739709d5 [formerly 7a1c02eac8] [formerly a6cccde03f [formerly 1fe04ca5037355f11d0deab7ebcc27b84e0a337b]]]
Former-commit-id: a6cccde03f
Former-commit-id: 4d11d1bed2 [formerly fdcb9d2070]
Former-commit-id: 6cf41de9f8
2013-08-06 10:09:50 -05:00
Nate Jensen
88fb4ae098 Merge "Issue #1726 change how swt is imported to tests" into development
Former-commit-id: fe50df0d72 [formerly 35ec9bb413] [formerly fe50df0d72 [formerly 35ec9bb413] [formerly 730f0d7f78 [formerly 47f5fbe957aedbf7edbc9b45fd9774fb73fa1c9f]]]
Former-commit-id: 730f0d7f78
Former-commit-id: a23cc7344c [formerly 6f61e57845]
Former-commit-id: 884506cd70
2013-08-06 09:57:44 -05:00
Nate Jensen
6585abee8e Issue #2228 use TMemoryInputTransport for slight efficiency improvement
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf

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

Former-commit-id: bf0fc07a89 [formerly 0e0504f9fe] [formerly bf0fc07a89 [formerly 0e0504f9fe] [formerly 1e42d0b7a6 [formerly 78606bdbbde14383b3b12e4d72772dc6a8d1a21b]]]
Former-commit-id: 1e42d0b7a6
Former-commit-id: b1204865d2 [formerly 80064a389f]
Former-commit-id: 773393483a
2013-08-06 09:44:47 -05:00
Lee Venable
18dad40473 Merge "Issue #2143. Changes for non-blocking SCAN dialogs." into development
Former-commit-id: 89e05a8de1 [formerly a2ae8fe5de] [formerly 89e05a8de1 [formerly a2ae8fe5de] [formerly 2a74881571 [formerly 8a893db2a506ade83e6cd22355893138c32cdfea]]]
Former-commit-id: 2a74881571
Former-commit-id: 3e098ce4f4 [formerly 8f0fa192bb]
Former-commit-id: f1b42ae10e
2013-08-06 09:32:21 -05:00
Nate Jensen
8727d5190c 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: 2319a713ce [formerly fcb6f59a3f] [formerly 2319a713ce [formerly fcb6f59a3f] [formerly 28ffe0f3f1 [formerly 48e80dd9732e0b20f211fa456c8bec81b4495555]]]
Former-commit-id: 28ffe0f3f1
Former-commit-id: 5c078cd52b [formerly 51ce39012d]
Former-commit-id: 7a045f1d12
2013-08-06 08:35:50 -05:00
Max Schenkelberg
424f455607 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: 54fe14b06b [formerly 474429aaee] [formerly 54fe14b06b [formerly 474429aaee] [formerly f08e2d5edc [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]]
Former-commit-id: f08e2d5edc
Former-commit-id: 541c66a894 [formerly fc60d55637]
Former-commit-id: 71ee818ed0
2013-08-05 16:46:02 -05:00
Roger Ferrel
7a264801f1 Issue #2221 - Changes to have select configuration files for retention and case creation.
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f

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

Former-commit-id: 14c32d882c [formerly ca8fcf84e5] [formerly 14c32d882c [formerly ca8fcf84e5] [formerly ba5cacb5e5 [formerly a69fe2bc71ea77e941c9e20bfbc01d9c74ba94c7]]]
Former-commit-id: ba5cacb5e5
Former-commit-id: 33d37db782 [formerly 09b2a2a8a6]
Former-commit-id: bcb76fba53
2013-08-05 12:13:15 -05:00
Nate Jensen
a4d56766bf Merge "Issue #2202 Add edex specific connectivity checking. Change-Id: I003957001ed608d1054ab2a87019b018f8996d36" into development
Former-commit-id: a28827953e [formerly b7e69cfcd5] [formerly a28827953e [formerly b7e69cfcd5] [formerly 21b0a2b103 [formerly 1c314409369402473812c954821e0d47a4e05183]]]
Former-commit-id: 21b0a2b103
Former-commit-id: 08e3b40e4b [formerly 159e35d87e]
Former-commit-id: 790a50ec95
2013-08-05 11:38:02 -05:00
Ben Steffensmeier
7028e9f71f Issue #2202 Add edex specific connectivity checking.
Change-Id: I003957001ed608d1054ab2a87019b018f8996d36

Former-commit-id: 54321b4839 [formerly cfd9cb0b7d] [formerly 54321b4839 [formerly cfd9cb0b7d] [formerly fac4cdc131 [formerly b8e5323b70db03817c6c750746f29cc550cbc815]]]
Former-commit-id: fac4cdc131
Former-commit-id: b7e7e69acd [formerly 66ce1a9c68]
Former-commit-id: 977e135e17
2013-08-05 11:17:23 -05:00
Richard Peter
4bd15f7789 Merge "Issue #2057 Added support for marking obsolete databases for later removal." into development
Former-commit-id: c43cdaeb76 [formerly af826f283b] [formerly c43cdaeb76 [formerly af826f283b] [formerly f964cc3e65 [formerly 5e67c228fea2f719bfb0561132701097bf785a80]]]
Former-commit-id: f964cc3e65
Former-commit-id: 0d69b079ee [formerly 9a6015efcb]
Former-commit-id: c3fd34895c
2013-08-05 09:51:14 -05:00
Greg Armendariz
f0182934bf Issue #2191 - Fix build
Former-commit-id: 951aea1539 [formerly 0033adf062] [formerly 951aea1539 [formerly 0033adf062] [formerly f5a2245c51 [formerly c7b8b6aaf43fd3ed1d73be7ceed8b002a0325205]]]
Former-commit-id: f5a2245c51
Former-commit-id: 7f7c8cfb34 [formerly a7d1d0ae75]
Former-commit-id: 178d42db2e
2013-08-04 08:35:51 -05:00
Richard Peter
7efe851b06 Merge "Issue #2191 Registry federation synchronization and garbage collection" into development
Former-commit-id: 22f8248332 [formerly e692cc245b] [formerly 22f8248332 [formerly e692cc245b] [formerly 137bb556ee [formerly 4e3f429e5aebec59e5c15c8bea062cc62e599cc6]]]
Former-commit-id: 137bb556ee
Former-commit-id: f348aadcd4 [formerly 549ffd000c]
Former-commit-id: 7659b6b6e4
2013-08-02 14:44:16 -05:00
Slav Korolev
f6d25af6ae Issue #2143. Changes for non-blocking SCAN dialogs.
Change-Id: I0afcaced20e0cc76cbcb2d64a24fcfc3022dc1d1

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

Former-commit-id: 825ef1aa02 [formerly 4cdb105622] [formerly 825ef1aa02 [formerly 4cdb105622] [formerly 1a66522590 [formerly 6857a74daf7ac43aa76715aff31dfbed04ff0b0b]]]
Former-commit-id: 1a66522590
Former-commit-id: 80905446a3 [formerly 51b36a0612]
Former-commit-id: 9a51923f38
2013-08-01 13:46:21 -05:00
Greg Armendariz
d8ee1daa59 Merge "Issue #2213 - create the primary and backup exportgrids directories for GFESuite" into development
Former-commit-id: 5d312802d3 [formerly 6fc06bb4e4] [formerly 5d312802d3 [formerly 6fc06bb4e4] [formerly f6f9b823d8 [formerly 86902fe016dd65446e74c405a93ba0142affc9a4]]]
Former-commit-id: f6f9b823d8
Former-commit-id: 0d137cd803 [formerly 8afd882a55]
Former-commit-id: 075a297be2
2013-08-01 13:29:26 -05:00
Steve Harris
a3f0e4c84b Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 1917c598bc [formerly 72893066cc] [formerly 1917c598bc [formerly 72893066cc] [formerly 97ef150656 [formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]]
Former-commit-id: 97ef150656
Former-commit-id: 6ec0c65e84 [formerly b346666ef1]
Former-commit-id: 834819949f
2013-08-01 08:27:10 -05:00
Steve Harris
ef41819406 13.5.1-9 baseline
Former-commit-id: 778df21de9 [formerly 97fe6a670f] [formerly 778df21de9 [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: c7e7c838aa [formerly bbb7f1dd49]
Former-commit-id: e16fce85ae
2013-08-01 09:20:23 -04:00
Ron Anderson
eabd25e221 Issue #2057 Added support for marking obsolete databases for later removal.
Change-Id: Ie1859e08c7a0305f3ea7bc82e726dd8ba1658b1a

Former-commit-id: fa3640fb11 [formerly b84a946f86] [formerly fa3640fb11 [formerly b84a946f86] [formerly 2a0c77eb5c [formerly db55eb737e5b7a82dec8f585eabda455717321a2]]]
Former-commit-id: 2a0c77eb5c
Former-commit-id: 4b2660c2c4 [formerly f54129bbda]
Former-commit-id: 648e17e9e0
2013-07-31 17:38:09 -05:00
Richard Peter
df500232bf Merge "Issue #2236 Merged Mike's Code" into development
Former-commit-id: 655ec4521d [formerly 733c4806e8] [formerly 655ec4521d [formerly 733c4806e8] [formerly 563abed925 [formerly 837c11d7cb97b36751b37c4468ff00b0e261b870]]]
Former-commit-id: 563abed925
Former-commit-id: c492ced15d [formerly 6a6ccaf622]
Former-commit-id: ad321f41df
2013-07-31 16:33:01 -05:00
Richard Peter
e08fdb2864 Merge "Issue #2220 Implement Archive GUI's recompute sizes." into development
Former-commit-id: f3a57e9237 [formerly 9acfea6525] [formerly f3a57e9237 [formerly 9acfea6525] [formerly d1fa0bb7c8 [formerly 080503d71a2b4e40f8ef7985ef01142c2fa29ce0]]]
Former-commit-id: d1fa0bb7c8
Former-commit-id: 3796a1ab40 [formerly fe0573a141]
Former-commit-id: 67ddc717d4
2013-07-31 16:31:24 -05:00
Lee Venable
5dde9818b7 Merge "Issue #2227 fix weird swapping behavior on 4 panel" into development
Former-commit-id: 68018b239c [formerly c1c97f0a72] [formerly 68018b239c [formerly c1c97f0a72] [formerly c0d3ef6e8c [formerly 8313addc8b417aa769264f95f2b22fd65426e88d]]]
Former-commit-id: c0d3ef6e8c
Former-commit-id: a468f3b5db [formerly 016cd9a487]
Former-commit-id: 22a6dbde4d
2013-07-31 16:29:55 -05:00
Dave Hladky
aa099029be Issue #2236 Merged Mike's Code
Change-Id: I78943ceee3aeea1eeb6d815fefd3e82b46d677a6

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

Former-commit-id: 31f450ccd8 [formerly 341138f01c] [formerly 31f450ccd8 [formerly 341138f01c] [formerly a4b4177199 [formerly 83eaaa8e7635c15905f2028dd9f91425bc54826f]]]
Former-commit-id: a4b4177199
Former-commit-id: cc05c64eac [formerly 7092cd385b]
Former-commit-id: c3357ca6d6
2013-07-31 14:50:42 -05:00