Commit graph

3068 commits

Author SHA1 Message Date
Jonathan Sanchez
231cedc656 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly dad0681ae0 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]]
Former-commit-id: dad0681ae0
Former-commit-id: 1e64c5d491 [formerly b467d0fd66] [formerly 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f]]
Former-commit-id: 8a26fc85e651fdc70a339fe1b11109ae175e19ba [formerly 9be546dab8]
Former-commit-id: 21368ade28
2013-08-08 16:31:35 -05:00
David Gillingham
f5ed9fa3c6 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly f839ef6f3b [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]]]
Former-commit-id: f839ef6f3b
Former-commit-id: 3ec31afc5d [formerly 5f9352cb65] [formerly d665f9bc6ae29833ae4f277da48202baec858dd5 [formerly 616c023369]]
Former-commit-id: 18e571136ecc882716d7770817208f07ca118c73 [formerly 6b03403d65]
Former-commit-id: 651ed92403
2013-08-08 09:41:33 -05:00
Greg Armendariz
1a04182d44 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 65b70ce223 [formerly fc6195bbf6] [formerly 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72]]
Former-commit-id: a084eb93b668c3922297767a4872577df1c23840 [formerly 9a1b44efdc]
Former-commit-id: 4b29a16298
2013-08-07 14:46:30 -05:00
Greg Armendariz
7fb928e967 13.5.1-11 baseline
Former-commit-id: 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 4c20fc4977 [formerly 75f9f8df3f] [formerly f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb]]
Former-commit-id: 4b97c9297a6132e1a64e7b28e4204a8cd32cdd79 [formerly f06ee47260]
Former-commit-id: 8bf2c1cc07
2013-08-07 14:34:27 -04:00
Greg Armendariz
0bb16ced54 13.5.1-10 baseline
Former-commit-id: 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly acf7ced37b [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]]
Former-commit-id: acf7ced37b
Former-commit-id: 690ea2e228 [formerly 9ddb32967c] [formerly 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88]]
Former-commit-id: f92c8134fca60f550bc93797091c6154015f9683 [formerly f37ef8c24e]
Former-commit-id: 5998f47f57
2013-08-07 14:14:46 -04:00
Ben Steffensmeier
a6a4075f13 Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly b06171b4f2 [formerly f0ceddacf1 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]]
Former-commit-id: b06171b4f2
Former-commit-id: 6d60a18a2d [formerly 7de39a58bb] [formerly 638ab88007fb4ccfc259d1c8e3cfadd1bdb30ab1 [formerly 3eb869c65e]]
Former-commit-id: caeba084d0723bb0ee2b76813919bcea8b28e44d [formerly 7e3835fd0a]
Former-commit-id: 7a95a653aa
2013-08-07 12:08:13 -05:00
Steve Harris
48c5fb1f4e Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 3573599aaf [formerly 1917c598bc] [formerly 72893066cc] [formerly 3573599aaf [formerly 1917c598bc] [formerly 72893066cc] [formerly 97ef150656 [formerly 72893066cc [formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]]]
Former-commit-id: 97ef150656
Former-commit-id: e680a0e630 [formerly 6ec0c65e84] [formerly 2b8530d5516361d757800e54b2cc11d91e3b78b4 [formerly b346666ef1]]
Former-commit-id: 37556376792a9859a1d670f73769f61cc7cbfa1d [formerly 834819949f]
Former-commit-id: a3f0e4c84b
2013-08-01 08:27:10 -05:00
Steve Harris
a7c6d3b46d 13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 7fc384a659 [formerly c7e7c838aa] [formerly 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]]
Former-commit-id: dd4d7bf31c8224a969995ed35d8e37b50bb8a6d6 [formerly e16fce85ae]
Former-commit-id: ef41819406
2013-08-01 09:20:23 -04:00
Ron Anderson
db13ebd4af Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10

Former-commit-id: c0dc7d2e46 [formerly 4c61168660] [formerly 390f5b2439] [formerly c0dc7d2e46 [formerly 4c61168660] [formerly 390f5b2439] [formerly 47b977cdec [formerly 390f5b2439 [formerly f4feae82505c29bc49113682d2cd584ec3ed6233]]]]
Former-commit-id: 47b977cdec
Former-commit-id: d09f5d9d0b [formerly 17fef5a2ab] [formerly 114c4a17a51aff6ca84968879bde76a89a25803b [formerly 77e8cd467f]]
Former-commit-id: 4b829c11b6f4e18ec14b77c5131e7e5289d9eb74 [formerly e1a78db830]
Former-commit-id: e8ab3a860f
2013-07-31 09:00:07 -05:00
Nate Jensen
75fcd9eed9 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 68fbcf5bb2 [formerly 7fc047102b] [formerly 5e29be3d1f] [formerly 68fbcf5bb2 [formerly 7fc047102b] [formerly 5e29be3d1f] [formerly 1c765670ea [formerly 5e29be3d1f [formerly 49299504331c730ffe8a94f490f88337baf12233]]]]
Former-commit-id: 1c765670ea
Former-commit-id: e60e5dba08 [formerly 5cc5818af7] [formerly 293b692d6b0250e935d8663ee184a7d26bdf62fd [formerly 97c71fc9dc]]
Former-commit-id: 6e74c2517ebc733bea1b8c35fa9aad029b8bab7d [formerly 91d5ab7554]
Former-commit-id: 60b3c042e7
2013-07-26 08:43:29 -05:00
Steve Harris
45bc4e9d50 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 5b142d82f5 [formerly 5697c124b7] [formerly caee8e354d] [formerly 5b142d82f5 [formerly 5697c124b7] [formerly caee8e354d] [formerly 804270e3a2 [formerly caee8e354d [formerly 5fca4065166ffd0e1d7a21f8463abd30657307b9]]]]
Former-commit-id: 804270e3a2
Former-commit-id: d2f1179995 [formerly 92a27a07bb] [formerly d658701a2fdde3a1dd32da88e66fdd3f14ead065 [formerly 31ab02f0d4]]
Former-commit-id: fdb312a83317688cc35c26a11cf1ec19e3567d6e [formerly b791fa322b]
Former-commit-id: 29be71f3cb
2013-07-26 08:28:54 -05:00
Steve Harris
dded20dc93 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60 [formerly a7d4c6274e] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
David Gillingham
380b13d352 Issue #1762: Fix Service Backup regression caused by last commit under this
ticket: NullPointerException caused by missing DynamicSerialize annotation and
disabled export configuration option caused by incomplete request.

Former-commit-id: e96c2962a5 [formerly 9fa6048f38] [formerly 881566d46b] [formerly e96c2962a5 [formerly 9fa6048f38] [formerly 881566d46b] [formerly 938f9cd7f7 [formerly 881566d46b [formerly 071f7e80fc09720a3b1763d4903eb75fb96ebcca]]]]
Former-commit-id: 938f9cd7f7
Former-commit-id: f22922eaca [formerly 72e808cb1c] [formerly 148b8c40d4c89da3d04e1f5c6a0dc0ba21499d31 [formerly 42f096abe8]]
Former-commit-id: 059d65f359518574a4d1fa4376a7b2dbfb491997 [formerly 274ca5a740]
Former-commit-id: 888a61c520
2013-07-22 17:24:00 -05:00
Richard Peter
449dcca1dd Issue #1977: Fix NCEP Plugin issues due to merge
Former-commit-id: 4d2b51881c [formerly 61455f533b] [formerly 82f3d26700] [formerly 4d2b51881c [formerly 61455f533b] [formerly 82f3d26700] [formerly c311adda88 [formerly 82f3d26700 [formerly 3496de5dfddf84fb7130d993a17dcf973018d2f1]]]]
Former-commit-id: c311adda88
Former-commit-id: 3604bc0b96 [formerly 6e895375bb] [formerly 8631f73cb55ec9e059c48450b3026b8f90c21f77 [formerly 14748bda85]]
Former-commit-id: 68028aa3f423c8e3787948796e3c140a4ff89630 [formerly f2846e2051]
Former-commit-id: 573bf9465e
2013-07-22 16:12:01 -05:00
Bryan Kowal
04e82d590c Issue #2206 - relocate ATBL directory change to 13.5
Former-commit-id: 49efaf00e0 [formerly aeb80aa780] [formerly b8de269bd0] [formerly 49efaf00e0 [formerly aeb80aa780] [formerly b8de269bd0] [formerly 75e9bdcb7a [formerly b8de269bd0 [formerly 5ba0ee80d25a5fe548d31f736eceb38a58f8ee90]]]]
Former-commit-id: 75e9bdcb7a
Former-commit-id: 1ce7b8d139 [formerly 9bfdd9121d] [formerly eb3e8c53dc32d32a4bccd6e571905081f01e2dee [formerly b45ee945b3]]
Former-commit-id: b361560b3522fde576719190a6f2430e5bb3fa3d [formerly ee99d6f73d]
Former-commit-id: 27c868f201
2013-07-22 13:44:32 -05:00
Ron Anderson
2d662d54e2 Merge "Issue #1842: Fix issue where start time of in progress VTEC events was being set to 991130T0000Z." into omaha_13.5.1
Former-commit-id: 2089070a96 [formerly ecf1cfe4ed] [formerly 02dbc313c8] [formerly 2089070a96 [formerly ecf1cfe4ed] [formerly 02dbc313c8] [formerly 249e7b1aaa [formerly 02dbc313c8 [formerly 7e04107b602191703a8dbe19b7182ccb41a13eb1]]]]
Former-commit-id: 249e7b1aaa
Former-commit-id: 776a8b1ec3 [formerly 188ae55396] [formerly 78783370cdef4d5ebf4a1541cf82e7dd322db711 [formerly d62ba6c852]]
Former-commit-id: 6539bb9684b40fbaf3b41f67750af1fd1e2bef18 [formerly ff6f9def32]
Former-commit-id: 89ef1f295b
2013-07-22 09:47:09 -05:00
Greg Armendariz
723d0a4806 Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly d5ea12d97f [formerly a3b77f2623 [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]]
Former-commit-id: d5ea12d97f
Former-commit-id: 4c26ff845a [formerly c8c2a3d636] [formerly 6a070220b5d10249ff1b492f7b2e28dd9dd2b76e [formerly 3947baa02d]]
Former-commit-id: f1f5602f12e8568c08454a071de154890cb220bf [formerly e1092b5725]
Former-commit-id: 6c35eb215a
2013-07-19 14:15:24 -05:00
David Gillingham
73006f4de2 Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: 2ad8bd7bcd [formerly 62d740b2ed] [formerly 1fc7c3197a] [formerly 2ad8bd7bcd [formerly 62d740b2ed] [formerly 1fc7c3197a] [formerly d0568ff347 [formerly 1fc7c3197a [formerly bf21f81dcad44880af5a3f988d15d4330b2b1d6b]]]]
Former-commit-id: d0568ff347
Former-commit-id: 61ef3ec108 [formerly 988a705e81] [formerly 46fe96a6849444cf7e9aeddeda70aed4f091031e [formerly 4b9edbdcb4]]
Former-commit-id: d8263245acac3de84477b4282ece967a0bd90e38 [formerly e52a6caa0e]
Former-commit-id: 6415691028
2013-07-19 11:24:30 -05:00
Bryan Kowal
a3b4b564ab Issue #2153 - fix 13.5.1 build after merge
Former-commit-id: 0a4d751112 [formerly b49ddfe75a] [formerly 914f2f7e2f] [formerly 0a4d751112 [formerly b49ddfe75a] [formerly 914f2f7e2f] [formerly e9e3baa4df [formerly 914f2f7e2f [formerly a70fac10e48f1fc258a7756acb4d48560a54248d]]]]
Former-commit-id: e9e3baa4df
Former-commit-id: 18f781ee61 [formerly d67aa10275] [formerly 243a3b4f5bb1ab2d3bf98b3e738e06b86d9930de [formerly a7f431e526]]
Former-commit-id: ab3ee7fa5b0a2d8d14a2afa09e3342b6f7efca17 [formerly 9af77e045c]
Former-commit-id: 21902a3edb
2013-07-19 10:28:30 -05:00
Richard Peter
69af3f93ca Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: e46425cd8d [formerly eefaf2c836] [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]]
Former-commit-id: fcddfd2ee1c278a22544ea6d0efd7a301de67fff [formerly 3a573f4256]
Former-commit-id: 374879df01
2013-07-18 21:46:25 -05:00
Steve Harris
adf2f89d57 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Dustin Johnson
ba4e0041a9 Issue #2205 Fix cancelling adhoc queries
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: ed50793d64 [formerly 584e427e81] [formerly 58ab4e5cfc] [formerly ed50793d64 [formerly 584e427e81] [formerly 58ab4e5cfc] [formerly 9aadc61ea5 [formerly 58ab4e5cfc [formerly dd05e6c8f9c17ac331b137b9eb3d486c459144fb]]]]
Former-commit-id: 9aadc61ea5
Former-commit-id: 47b5f3aa73 [formerly 520d539a44] [formerly 34a268fe658d39e9111d17c052060bbb36bf86e0 [formerly 54ff2b87c6]]
Former-commit-id: 5c1de511e41dbc8984c9686a7ae60f25c05944fa [formerly 865d1d88fc]
Former-commit-id: f342d10b14
2013-07-18 11:06:42 -05:00
Roger Ferrel
df37274974 Issue #1966 Relocation of configuration files and checks for bad configuration files.
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly 91ee1d36bf [formerly c002045a87 [formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]]]
Former-commit-id: 91ee1d36bf
Former-commit-id: 1f56a1179e [formerly 97e4dc3633] [formerly e674edd4dd9db03d4b9f31499b37657af33debd7 [formerly 95cb3439a4]]
Former-commit-id: 4285173926a19c787c964793fdd7bd9e860c0e29 [formerly 47ac9a9147]
Former-commit-id: 8d6092bbf0
2013-07-18 10:02:05 -05:00
Nate Jensen
ded426050e Merge "Issue #2184 Removed all other HUCs other than ALL from storage" into omaha_13.5.1
Former-commit-id: c04357a0b6 [formerly 96ae856660] [formerly 09cae0cba3] [formerly c04357a0b6 [formerly 96ae856660] [formerly 09cae0cba3] [formerly 3649af1b71 [formerly 09cae0cba3 [formerly 7f9e83b42df42c1bec7946833e88a8916fc0c12d]]]]
Former-commit-id: 3649af1b71
Former-commit-id: afb7f93c21 [formerly a9f0243e01] [formerly 171ed9b9a2486eb3a9ba6e19cecfe9daeced6126 [formerly cb9b26a380]]
Former-commit-id: c4212ac6ccdd498b29f780728ef4250b940f63d7 [formerly c6c8c3c2d0]
Former-commit-id: 1df8a39cd9
2013-07-17 16:34:25 -05:00
Dave Hladky
ffe58606fe Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly bd03085f8d [formerly 84dae0a6b8 [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]]]
Former-commit-id: bd03085f8d
Former-commit-id: 6f43853101 [formerly 4556798697] [formerly a1bddfe6f6215adf6084c27a5107f0fcd314b75b [formerly 15738a4d30]]
Former-commit-id: 1d2fbac9ecdf8c1c0fa1cc39f8c710dab63ba6bc [formerly f5ea1f0327]
Former-commit-id: 779ebd5db3
2013-07-17 15:18:49 -05:00
Ben Steffensmeier
1e8b99a544 Issue #2107 Fix sampling of grid vector arrows.
Change-Id: If663d487fa31cba43d18b82bf93fdfacbbc65721

Former-commit-id: b1cb837528 [formerly fb1a0a203a] [formerly 767915b318] [formerly b1cb837528 [formerly fb1a0a203a] [formerly 767915b318] [formerly 4a25b32919 [formerly 767915b318 [formerly eae0b3931a3f5888b32c49a8c7e5b97addb3201a]]]]
Former-commit-id: 4a25b32919
Former-commit-id: f2777babaf [formerly a82bb6e999] [formerly 61ef9e737b64b455fe0c36337caebc3edabe3d2d [formerly abedf0f23a]]
Former-commit-id: 787307082d8bdff26dc28ad3d4ee49ab4a584b64 [formerly 5b68e9d57c]
Former-commit-id: e6b5f4f6a6
2013-07-15 15:51:41 -05:00
Greg Armendariz
df73c0e2e9 13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977 [formerly 93b71934c0] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d]
Former-commit-id: b601345c9f
2013-07-10 10:04:22 -04:00
Ben Steffensmeier
7b48c5038a Issue #1869 Switch location hibernate type to use hibernate spatial.
Former-commit-id: 9d1910ba9d [formerly f8596f1f5a] [formerly 7a31fbb386] [formerly 9d1910ba9d [formerly f8596f1f5a] [formerly 7a31fbb386] [formerly bbdd5cdc79 [formerly 7a31fbb386 [formerly b434131d412788c478ec45114a86abe925a79d4c]]]]
Former-commit-id: bbdd5cdc79
Former-commit-id: 87cc8f9112 [formerly a524c3f17d] [formerly 4c381305878cb140792b9d6b0b8239024c1f483f [formerly d0b0d981cc]]
Former-commit-id: abce4baedd0fd36fcdcf80fdb8b4981ea85727b7 [formerly db54975911]
Former-commit-id: c02d27fe9e
2013-07-09 18:25:11 -05:00
Dustin Johnson
e46cb588f2 Issue #2038 Correct unregisterFromBandwidthEventBus() to actually do it
Change-Id: Ic82c974dcf354d9fb871b1b2f81cea52e2502fe8

Former-commit-id: 215e3fbd8d [formerly 2cfe1506a4] [formerly 0393cec5d5] [formerly 215e3fbd8d [formerly 2cfe1506a4] [formerly 0393cec5d5] [formerly 9f6bd8b32b [formerly 0393cec5d5 [formerly 198c9895608d22b3e3a616f2812628be32da514b]]]]
Former-commit-id: 9f6bd8b32b
Former-commit-id: d506f63c65 [formerly 617fdd6b44] [formerly d307875965a1a0d3fecaaf627504cf76ab5c4496 [formerly 3cb8e1336c]]
Former-commit-id: 8c41760d6ddca7ab7a22a2d092e358ead6a94526 [formerly b9f992626c]
Former-commit-id: 06ce541b67
2013-07-09 14:55:22 -05:00
Ben Steffensmeier
b6764e390e Issue #1869 Format Calendar when making Constraint Mapping.
Former-commit-id: bbea2d76c5 [formerly 2cccbc8e0d] [formerly f53f702b9e] [formerly bbea2d76c5 [formerly 2cccbc8e0d] [formerly f53f702b9e] [formerly c3f48bac0a [formerly f53f702b9e [formerly 58d020c1b09b4f5efc1fc9b558ef7defef80adba]]]]
Former-commit-id: c3f48bac0a
Former-commit-id: 3555a55bda [formerly 4bdec4b2bb] [formerly efa98dc017879571de4c3992f60b9a80924bd274 [formerly 1017dfae5b]]
Former-commit-id: 028655e89b75a3bb704036327e99d1ed4a519937 [formerly 236ec98da1]
Former-commit-id: 364a7ec1b6
2013-07-09 14:01:13 -05:00
Brad Gonzales
86569acffd Issue #1965 Changed to use File.delete() instead of Apache FileUtil.deleteQuietly().
Amend: Update from peer review.

Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd

Former-commit-id: cc89d3939d [formerly 2ced007de9] [formerly b462162996] [formerly cc89d3939d [formerly 2ced007de9] [formerly b462162996] [formerly 503d6d6cca [formerly b462162996 [formerly defb699314eec545eff3b3b603b059ef05ac1a23]]]]
Former-commit-id: 503d6d6cca
Former-commit-id: 2a3706a8f1 [formerly 222965ca7f] [formerly ece70e73a38f366159776702fbedeee0c1c366ee [formerly 4f80abebaa]]
Former-commit-id: 84d33297e2e3c72a87a8cbf7c52ee2f49f1d1d66 [formerly 6de2098f63]
Former-commit-id: 1405b1f061
2013-07-09 09:07:38 -05:00
Bryan Kowal
66be02b953 Issue #2153 - fix commons-logging dependencies for wes2bridge
Former-commit-id: a9f9517cfc [formerly 8485164fa2] [formerly 650509604a] [formerly a9f9517cfc [formerly 8485164fa2] [formerly 650509604a] [formerly c3a87eadea [formerly 650509604a [formerly 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65]]]]
Former-commit-id: c3a87eadea
Former-commit-id: a5d925cf35 [formerly bdabcac203] [formerly 7544cc885821cce005f9f789f2f8be15b1c17560 [formerly 2dc96499d0]]
Former-commit-id: 9d0ccc0282df419cdba68586b88024f8b87a7069 [formerly b3a93df1df]
Former-commit-id: 259a7d99b1
2013-07-08 20:14:11 -05:00
Ben Steffensmeier
f23a0b83b6 Issue #1869 Fix goes sounding updates.
Change-Id: Ib974c8e88bea021e0e8505e6fb2974f4e108dc80

Former-commit-id: 4f6bd4efc3 [formerly 309624cb7b] [formerly dbe74b56e5] [formerly 4f6bd4efc3 [formerly 309624cb7b] [formerly dbe74b56e5] [formerly 21abe429ec [formerly dbe74b56e5 [formerly 127609cb0ced4b4554943ad78d4263cb70489a90]]]]
Former-commit-id: 21abe429ec
Former-commit-id: be1edd618a [formerly 0b9c18aa23] [formerly e8ccecad63676e5cbd08522fca1e434bdfd7efdc [formerly e92d1e9cad]]
Former-commit-id: a132328ae92b20ca4260cd587a4b886795dc5001 [formerly c74c93af71]
Former-commit-id: 812a14c5cc
2013-07-08 11:47:08 -05:00
Greg Armendariz
5e1549062b 13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: d5bea0fc06 [formerly d899faec3d] [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]]
Former-commit-id: 22058c6a24f6da687ba40d05b28790e525082567 [formerly dc881f4ed8]
Former-commit-id: 13ac0b1062
2013-07-03 12:20:27 -04:00
Bryan Kowal
36e343f8ab Issue #2153 - 13.5.1 build update
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05

Former-commit-id: 4dfb37f2df [formerly 2e46748156] [formerly 6a6cdd7f6d] [formerly 4dfb37f2df [formerly 2e46748156] [formerly 6a6cdd7f6d] [formerly dc177c90d1 [formerly 6a6cdd7f6d [formerly 8a021ef97c67a4fc7325ce91808cd5878fbd2cda]]]]
Former-commit-id: dc177c90d1
Former-commit-id: ba832ceb8a [formerly 94ecc8119c] [formerly 584813a4d670c8624b18ce891479c0cda0c9e5b8 [formerly 6bbe51aca9]]
Former-commit-id: c0242fd39084238abee13b55dd209e917f143ff7 [formerly a89ff261d0]
Former-commit-id: c0905c536e
2013-07-02 16:12:06 -05:00
Roger Ferrel
9eb3cffa65 Issue #1964 clean up of features and manifest.
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 559a54ea8f [formerly 3c31d8c2ac] [formerly 41c46e14c0] [formerly 559a54ea8f [formerly 3c31d8c2ac] [formerly 41c46e14c0] [formerly 7d3362d2b5 [formerly 41c46e14c0 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: 56b1a0713c [formerly b3437266d7] [formerly 8c2a8d0c95f2cee23027bf633469a1a45f0b1e94 [formerly 201e62a4ad]]
Former-commit-id: ead9e92b266c6bc5d2a1e8b5c9c7e8b4d7cb051d [formerly ea00a52ebe]
Former-commit-id: 1d3ee09895
2013-07-02 11:14:56 -05:00
Nate Jensen
42a50bee52 Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
Former-commit-id: 4918ff844f [formerly c68cf47883] [formerly e4955f094c] [formerly 4918ff844f [formerly c68cf47883] [formerly e4955f094c] [formerly 01efa33cb9 [formerly e4955f094c [formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]]]]
Former-commit-id: 01efa33cb9
Former-commit-id: 5784cf98aa [formerly 058e47192a] [formerly b78d9642086e4dba406ba61967972b761bb20b75 [formerly 150203f5cc]]
Former-commit-id: 72adc28e1298571758c3c5e67205ef8cc350aa68 [formerly d288dded44]
Former-commit-id: 6c95177bdf
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
596ffc3b12 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: bbd2a9e5ab [formerly 58fcc4c896] [formerly a2328f0e06] [formerly bbd2a9e5ab [formerly 58fcc4c896] [formerly a2328f0e06] [formerly de24b8b431 [formerly a2328f0e06 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]]
Former-commit-id: de24b8b431
Former-commit-id: 767a7dd7d9 [formerly ab2e2f9a17] [formerly 092389edf48fb57d0afab52fb91a50a27f6e805d [formerly 4e1b0674e4]]
Former-commit-id: 549f5c664b546ffc489f5a28b764ce64bd4be1a4 [formerly 5431e5915d]
Former-commit-id: 28849d2a53
2013-07-02 11:04:26 -05:00
Roger Ferrel
d19356f2f7 Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

Former-commit-id: 50d0a74305 [formerly 82b1712714] [formerly c3ebc0cc1c] [formerly 50d0a74305 [formerly 82b1712714] [formerly c3ebc0cc1c] [formerly 68be9bd65f [formerly c3ebc0cc1c [formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]]]
Former-commit-id: 68be9bd65f
Former-commit-id: 4983001f68 [formerly ff84f293fd] [formerly 7f4689f8c48052cf1d41fa2ab3c0f6db2685a931 [formerly 933009605a]]
Former-commit-id: f6a150ac8b1ba5cebfcf55c2645b0e107c8a7b4f [formerly 68c22b7073]
Former-commit-id: 5eee41410c
2013-07-01 15:45:14 -05:00
Nate Jensen
dbd11273bf Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
Former-commit-id: 5b1d7fe401 [formerly b23dcab913] [formerly f7e743f388] [formerly 5b1d7fe401 [formerly b23dcab913] [formerly f7e743f388] [formerly 001fba449f [formerly f7e743f388 [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]]]
Former-commit-id: 001fba449f
Former-commit-id: c4edde79f5 [formerly 47d3441930] [formerly 27c725fc1f0951e0a75e945562aeea6cde35b4e0 [formerly 0cb9726554]]
Former-commit-id: 941bfb793aefcad79ab62db8cb3d7c09c08c774b [formerly 57d1375eed]
Former-commit-id: 89f8162e2b
2013-07-01 11:29:47 -05:00
Bryan Kowal
0a131779fb Issue #2153 - fix merge issue for build
Former-commit-id: eea749f828 [formerly 756fb4be59] [formerly f052982f8e] [formerly eea749f828 [formerly 756fb4be59] [formerly f052982f8e] [formerly 9c1aaa2bf5 [formerly f052982f8e [formerly 25560718fb861f13ff8701b9458a6b18adf523be]]]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: 1862ecd1a4 [formerly 08bb604ced] [formerly e6a347b2367d1c71b4d63cde07a471e571140e2f [formerly 37a5eb6c69]]
Former-commit-id: 6bb6713c6e6a75bf3d32f621f86e2d748d7f82f9 [formerly e6516def2a]
Former-commit-id: 29f21e56ee
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
9ab3a75c3b Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c14] [formerly 2d4a32ca64 [formerly ab8acf06e1] [formerly 81aad09d06] [formerly 2d4a32ca64 [formerly ab8acf06e1] [formerly 81aad09d06] [formerly e4c0188c14 [formerly 81aad09d06 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]]].


Former-commit-id: 772bf31dd0 [formerly 70ab67c3e5] [formerly c883b4e636] [formerly 772bf31dd0 [formerly 70ab67c3e5] [formerly c883b4e636] [formerly 7f74926bb4 [formerly c883b4e636 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]]]
Former-commit-id: 7f74926bb4
Former-commit-id: 5794a0bc3f [formerly fa0887429d] [formerly 112930e6b78a31053cde5b486cd3ccabf8fe7fbb [formerly 41e94abee3]]
Former-commit-id: 65fd0b4e49c824f0bc4cff2669cc7a364faee3ef [formerly a08032627c]
Former-commit-id: 23fe9db31b
2013-07-01 10:40:48 -05:00
Richard Peter
6434a4025d Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 582f38bdd4 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 0da7509e6d [formerly 69f8807963] [formerly ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee]]
Former-commit-id: 1478532c079d144368b91a4562993c9aac0b7cd4 [formerly 7ceb1bb9ab]
Former-commit-id: da3eb1e75c
2013-06-30 23:46:32 -05:00
Brad Gonzales
7c8f8a018c Issue #1965 added edex archive to the build.edex build.xml.
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: f95cf443d5 [formerly 2d1c6a0ec5] [formerly ba661b9e39] [formerly f95cf443d5 [formerly 2d1c6a0ec5] [formerly ba661b9e39] [formerly add108398a [formerly ba661b9e39 [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]]
Former-commit-id: add108398a
Former-commit-id: fb8caf6e22 [formerly bc766efb7a] [formerly 15de9e7faee3482eda51d0109f76645b35fd25bc [formerly 5c9ce05ce3]]
Former-commit-id: 795e5b8c49c2e0a6a652dcc5f274ef5fb1e2f348 [formerly c4daf04c32]
Former-commit-id: 245de9c408
2013-06-28 13:25:46 -05:00
Steve Harris
9f5469bc6e 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Brad Gonzales
8e22010180 Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
Amend: Added archive feature to the viz product build.
       Added archive feature to the viz developer product.

Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07

Former-commit-id: aca1486801 [formerly 65507d4424] [formerly c28d1e5d4d] [formerly aca1486801 [formerly 65507d4424] [formerly c28d1e5d4d] [formerly f4bb78381c [formerly c28d1e5d4d [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]]
Former-commit-id: f4bb78381c
Former-commit-id: 1c6ca60919 [formerly 6e99019a25] [formerly 5f9272a26bf176a83743b4b654221c8613a071d6 [formerly d842d8d9d0]]
Former-commit-id: 41beba358fca549dca62c32eff3862ee1f765033 [formerly f51c74e2d4]
Former-commit-id: 33dc495040
2013-06-27 17:40:07 -05:00
Brad Gonzales
d706ff2334 Issue #1965 added File filtering by file date extension in archive purge.
Amend: updated purge cron time to once every hour.
       moved archive.purge.cron to cron.properties.
       removed purge code from DataArchiver.
       added back isHoursToKeep in DataArchiver.
       updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
       updates from peer review.
       updated test cases to work with Roger's refactoring.
       fixes for ArchiveConfigManager createArchive.
       clean up of ArchiveConfigManager purgeFile.

Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519

Former-commit-id: 90f363d722 [formerly 67b4a2e202] [formerly 137c66539e] [formerly 90f363d722 [formerly 67b4a2e202] [formerly 137c66539e] [formerly 276f05233f [formerly 137c66539e [formerly 2094b7f9fde97873c759da217498bcf62254a287]]]]
Former-commit-id: 276f05233f
Former-commit-id: df7670676b [formerly d6fb315096] [formerly ca13651aece598f209306490fbd73fd98936b032 [formerly 4f54596904]]
Former-commit-id: 450a3eb9f6de7a580368b452e78efb57b1066c68 [formerly d047e6a137]
Former-commit-id: 9a5c3e259d
2013-06-27 11:46:44 -05:00
Roger Ferrel
667104c43e Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3

Former-commit-id: 713f39c429 [formerly 6f07f6f3bd] [formerly ee409c0819] [formerly 713f39c429 [formerly 6f07f6f3bd] [formerly ee409c0819] [formerly f66681f62b [formerly ee409c0819 [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]]
Former-commit-id: f66681f62b
Former-commit-id: 79c0bbb140 [formerly 5f35643c2d] [formerly 91667b1a98b4d6dfebf3dbfd34ceea45670f8fe7 [formerly 45dcfe3ad8]]
Former-commit-id: d681469cf5de2614b883cebf316eab2fd929d808 [formerly bec6928ea9]
Former-commit-id: 6261e65829
2013-06-27 07:51:56 -05:00
Richard Peter
fa3b24f01c Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
Former-commit-id: 45956fdcaa [formerly e3886246fd] [formerly 3a3dc3d208] [formerly 45956fdcaa [formerly e3886246fd] [formerly 3a3dc3d208] [formerly 67d052307c [formerly 3a3dc3d208 [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]]]
Former-commit-id: 67d052307c
Former-commit-id: 59789a3885 [formerly 1b00dd48ec] [formerly 705e64d8c7547f55a4b9ebb9c95b3b9faf82cc18 [formerly 208b01a167]]
Former-commit-id: 95025b5bae17b8047a17d9fcfad27a79cc831d65 [formerly 575405b14e]
Former-commit-id: 2952f2b56d
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
5c0ec55d70 Issue #1869 Fix plot sampling.
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 9e23a71d84 [formerly 570da6f0d5] [formerly 8c14a34f46] [formerly 9e23a71d84 [formerly 570da6f0d5] [formerly 8c14a34f46] [formerly 6db28c32a5 [formerly 8c14a34f46 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]]
Former-commit-id: 6db28c32a5
Former-commit-id: 9906f30ff0 [formerly 2ce266f7e7] [formerly b33a1c795a47c684e688769e932048e39d11d241 [formerly f26a72afe9]]
Former-commit-id: cfbc87543d974e56cf4a0535842654c9970b1607 [formerly 0d2f556144]
Former-commit-id: 6cb77b1793
2013-06-26 13:24:13 -05:00