Nate Jensen
b025262dc1
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 927da5cffb
[formerly 99b4a21414
] [formerly 3f3e0a788d
[formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 3f3e0a788d
Former-commit-id: a1f314948f
2013-05-29 14:49:43 -05:00
Nate Jensen
47d2bf99b9
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 7059967ae9
[formerly caf414bab0
] [formerly 148b20f57c
[formerly 19d32f4ffee269e244b77988f908a8e263374430]]
Former-commit-id: 148b20f57c
Former-commit-id: 72ed3e21b3
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
c6af8b4d7c
Issue #2036 Implemented federated query capabilities
...
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: e16dc02a54
[formerly 4747f7d319
] [formerly d5263b2b75
[formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]
Former-commit-id: d5263b2b75
Former-commit-id: 7cca4d8794
2013-05-29 10:34:22 -05:00
Dustin Johnson
b6c87f42b1
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
...
Former-commit-id: 7ca6f18405
[formerly 66c941fc3f
] [formerly ac292f1242
[formerly 346f09f53275928fc43d86dd41d7edd519581caf]]
Former-commit-id: ac292f1242
Former-commit-id: ef43634c56
2013-05-29 09:27:30 -05:00
Richard Peter
d26eac7bdf
Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
...
Former-commit-id: 6dd22b6dfa
[formerly bc0f1c88fc
] [formerly 19272c9f28
[formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]
Former-commit-id: 19272c9f28
Former-commit-id: 4be6514b57
2013-05-29 09:26:10 -05:00
Nate Jensen
452858b86f
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
...
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: 808ab352c5
[formerly 82d6c03669
] [formerly 36bc35b5c8
[formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]
Former-commit-id: 36bc35b5c8
Former-commit-id: cb4b66d37a
2013-05-29 09:20:53 -05:00
Mike Duff
d9fd9d297b
Issue #2016 - fix TS Trace toggle
...
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4
Former-commit-id: 51de726e49
[formerly afbe294f4a
] [formerly 5919687484
[formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]
Former-commit-id: 5919687484
Former-commit-id: 66f4e6fe87
2013-05-29 09:15:46 -05:00
Dustin Johnson
fff0172786
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: c76fa3bc2a
[formerly 0a9e7ed740
] [formerly 31e01a9f9a
[formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]
Former-commit-id: 31e01a9f9a
Former-commit-id: 187a1e49ef
2013-05-29 09:02:47 -05:00
Nate Jensen
ac838f62dd
Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
...
Former-commit-id: ba5e69c7ff
[formerly 7c1e6e8b09
] [formerly 256a67a9f9
[formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]
Former-commit-id: 256a67a9f9
Former-commit-id: 2fe1960ebb
2013-05-28 15:43:31 -05:00
Nate Jensen
607e980d45
Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
...
Former-commit-id: cba08666e6
[formerly 053e37ee76
] [formerly e846e539fb
[formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]
Former-commit-id: e846e539fb
Former-commit-id: 5c60582df2
2013-05-28 15:43:23 -05:00
Max Schenkelberg
4e8d25b317
Issue #1638 Fixed text box drawn to be correct size with padding around text
...
Amend: Fixed format string issues with topo resource and colorbar labels
Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114
Former-commit-id: a88ca5e983
[formerly 13ff44fdee
] [formerly 3175563336
[formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]
Former-commit-id: 3175563336
Former-commit-id: 9932114218
2013-05-28 15:00:59 -05:00
Nate Jensen
f7817d7c41
Issue #1967 fix annoying warnings, remove unused preferences page
...
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0
Former-commit-id: bd8431b986
[formerly ed7b0fc8c5
] [formerly 3f85aeb00a
[formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]
Former-commit-id: 3f85aeb00a
Former-commit-id: 0b48f54f47
2013-05-28 14:30:26 -05:00
Roger Ferrel
838eacc802
Issue #1966 Changes to CategoryConfig to make parsing more efficent.
...
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87
Former-commit-id: 365af6b7ce
[formerly cbee731447
] [formerly 9263b54845
[formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]
Former-commit-id: 9263b54845
Former-commit-id: fce5c2ca1e
2013-05-28 13:21:08 -05:00
Max Schenkelberg
6c9fedb312
Issue #1638 Added support for null search constraints for updates
...
Amend: Fixed comment, added SW history
Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515
Former-commit-id: 21693d6913
[formerly 1bc4437154
] [formerly 807e4501c8
[formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]
Former-commit-id: 807e4501c8
Former-commit-id: 036b11c84e
2013-05-28 12:59:27 -05:00
Nate Jensen
50d981285d
Issue #2037 made imageMap concurrent to fix memory leak
...
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f
Former-commit-id: 84444b6ba9
[formerly f77f350eb3
] [formerly 68eba61c28
[formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]
Former-commit-id: 68eba61c28
Former-commit-id: af7fcf7e8e
2013-05-28 09:21:57 -05:00
Dustin Johnson
8d00ba1978
Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
...
Former-commit-id: f4ad0218f2
[formerly 2b1f75f702
] [formerly 197a5cef1b
[formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]
Former-commit-id: 197a5cef1b
Former-commit-id: a8fc7295ef
2013-05-28 06:43:35 -05:00
Ben Steffensmeier
c71afc4198
Issue #1869 Fix unique checking for things without dataURI and with subtables.
...
Former-commit-id: cdf8e7daaa
[formerly 3b6156843e
] [formerly 7be9ad1f8b
[formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]
Former-commit-id: 7be9ad1f8b
Former-commit-id: 2a8a87e564
2013-05-24 16:40:21 -05:00
Mike Duff
6ee0ef55ff
Issue #2020 - Implement Shared Subscriptions Cave-side.
...
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf
Former-commit-id: 80b1f95f0c
[formerly 192ce891d0
] [formerly b6b01c3e81
[formerly 1e00c7f935cf22ac5064060069164af6044f2150]]
Former-commit-id: b6b01c3e81
Former-commit-id: a9004667b7
2013-05-24 09:20:55 -05:00
Nate Jensen
e976a4c94e
Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
...
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53
Former-commit-id: 631567ced9
[formerly 7d1fc954f6
] [formerly 7d233ff590
[formerly ef313253ec669167b9e1deb2562170c117123937]]
Former-commit-id: 7d233ff590
Former-commit-id: 9e37d21dc6
2013-05-24 09:13:10 -05:00
Bryan Kowal
c658131c84
Issue #1927 - mimic the EDEX pde build capability for building features outside of the common baseline
...
Amend: do not run the clean task after building any wa features
Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a
Former-commit-id: b3d40951ba
[formerly 8145305580
] [formerly a2148650b4
[formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]
Former-commit-id: a2148650b4
Former-commit-id: 66cf28ab84
2013-05-23 23:52:35 -05:00
Richard Peter
e65237b93f
Merge "Issue #1917 : Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period." into omaha_13.4.1
...
Former-commit-id: 344765c61d
[formerly 979cc8c181
] [formerly 732ae3c832
[formerly 09ec82babbc567bea671b606f3b45e8923c6e831]]
Former-commit-id: 732ae3c832
Former-commit-id: ec8c77f6f3
2013-05-23 18:10:58 -05:00
Lee Venable
041d612ea2
Issue #1964 - inital GUI creation
...
Change-Id: I47d58880066fa2ef284e8911390163624b873381
Former-commit-id: 4ecb65e4a2
[formerly ae020d3960
] [formerly c3328077c8
[formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]
Former-commit-id: c3328077c8
Former-commit-id: 9a72abf083
2013-05-23 17:16:31 -05:00
Roger Ferrel
ef14a57411
Issue #1966 Feature plugin for archive.
...
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771
Former-commit-id: 75a2fc4723
[formerly 9533bb686d
] [formerly e5867cbb79
[formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]
Former-commit-id: e5867cbb79
Former-commit-id: bdecc2f309
2013-05-23 13:43:53 -05:00
Ron Anderson
9cdf34184d
Merge "Issue #2025 : Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1
...
Former-commit-id: 1eb1cffa15
[formerly c0fffc630d
] [formerly 57c452b085
[formerly 339fa8409866f8464eebaf982cdbfc3ae37a8b6b]]
Former-commit-id: 57c452b085
Former-commit-id: 59d823bf7b
2013-05-23 12:12:39 -05:00
Richard Peter
53190601f6
Issue #1917 : Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
...
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c
Former-commit-id: d5c0b86b7a
[formerly b599745012
] [formerly 7349808131
[formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]
Former-commit-id: 7349808131
Former-commit-id: f3e0966966
2013-05-23 11:50:34 -05:00
Nate Jensen
a84a6fe6ae
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
...
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: b7cecb931e
[formerly 1978133177
] [formerly 1fd2f8965f
[formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 49b20e5d20
2013-05-23 11:20:40 -05:00
Nate Jensen
3287b6ace2
Merge "Issue #1989 use camel's built-in DirectVm component" into development
...
Former-commit-id: 876d741ab8
[formerly b8f3307f50
] [formerly 3b058175fe
[formerly f608d0ec297d85ba3e72c23905375f086fef2477]]
Former-commit-id: 3b058175fe
Former-commit-id: 71d9076fe2
2013-05-23 10:43:15 -05:00
Richard Peter
e150a51871
Merge "Issue #1989 fix clustered routes suspending/starting" into development
...
Former-commit-id: edd70dfe47
[formerly 57933400b9
] [formerly 9ca63e7d26
[formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]
Former-commit-id: 9ca63e7d26
Former-commit-id: 7a02b90690
2013-05-23 10:10:51 -05:00
Nate Jensen
882296f823
Issue #1989 use camel's built-in DirectVm component
...
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 65b9bafed7
[formerly d74936ef3e
] [formerly d7b8e04bb7
[formerly 90397159ef98097da0754a846d1f67d4839a300d]]
Former-commit-id: d7b8e04bb7
Former-commit-id: 91c8b9ac1d
2013-05-23 10:06:28 -05:00
Mike Duff
2878cde676
Issue #1902 - fix to forced guidance
...
Peer review comments
Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e
Former-commit-id: b331a68a08
[formerly 11423a7465
] [formerly 2a733fa5f8
[formerly ebd633109a62e7a2d8a0b8e3083aaf5680766739]]
Former-commit-id: 2a733fa5f8
Former-commit-id: 7d177607bf
2013-05-23 09:52:07 -05:00
Greg Armendariz
c7e028a6ff
Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development
...
Former-commit-id: 8cf9ef2527
[formerly 2089732453
] [formerly db8cf0d35f
[formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]
Former-commit-id: db8cf0d35f
Former-commit-id: 287f078150
2013-05-23 09:10:41 -05:00
Greg Armendariz
7c97422501
Merge "Issue #1927 - patch ant includegen task" into development
...
Former-commit-id: dc9623df11
[formerly 2fe2b0c5fb
] [formerly a4457f8c83
[formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]
Former-commit-id: a4457f8c83
Former-commit-id: 270269219c
2013-05-23 09:10:11 -05:00
Matt Nash
230e3d149e
Issue #1871 fix for 64 bit ints from Python to Java
...
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae
Former-commit-id: bbc7406812
[formerly bd64f70d1a
] [formerly 30c7ca8d36
[formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]
Former-commit-id: 30c7ca8d36
Former-commit-id: ca208f913c
2013-05-23 09:07:56 -05:00
Lee Venable
a551d4b586
Merge "Issue #1966 Feature place holders for the dialogs." into development
...
Former-commit-id: 6e7ed9e02b
[formerly cb156533f4
] [formerly 7245dff8b9
[formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]
Former-commit-id: 7245dff8b9
Former-commit-id: 8b13517100
2013-05-23 09:05:11 -05:00
Richard Peter
b28bb05fde
Merge "Issue #1965 Add org.apache.commons.io package to cots." into development
...
Former-commit-id: 895866b6d9
[formerly df415f7088
] [formerly 041c0ad948
[formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]
Former-commit-id: 041c0ad948
Former-commit-id: 08f45fe832
2013-05-23 08:52:47 -05:00
Roger Ferrel
760b0f3366
Issue #1966 Feature place holders for the dialogs.
...
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f
Former-commit-id: d7e7a56b84
[formerly e55f73b4f7
] [formerly d35424df4f
[formerly 04684460d021089818509726b1dd23d53fb90440]]
Former-commit-id: d35424df4f
Former-commit-id: 2d4434119d
2013-05-23 07:36:15 -05:00
Bryan Kowal
1469cb15d6
Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
...
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8
Former-commit-id: 73dfc7a5e1
[formerly bfd08efaa9
] [formerly 8061922b70
[formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]
Former-commit-id: 8061922b70
Former-commit-id: 83c1e3127e
2013-05-22 22:34:45 -05:00
Bryan Kowal
e6cfad1759
Issue #1927 - patch ant includegen task
...
Former-commit-id: 575944f70d
[formerly 40e8f544ea
] [formerly 24c0728db9
[formerly 912ec4daa384140f583d05d650734a9871ae1735]]
Former-commit-id: 24c0728db9
Former-commit-id: 2a17b35e83
2013-05-22 18:00:43 -05:00
Nate Jensen
5525412779
Issue #1989 fix clustered routes suspending/starting
...
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a
Former-commit-id: 57e560b745
[formerly 4ab1d90d67
] [formerly a6d525ec96
[formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]
Former-commit-id: a6d525ec96
Former-commit-id: 431e97742d
2013-05-22 16:39:24 -05:00
Steve Harris
389eefd1f9
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: 570128b986
[formerly 8496832064
] [formerly 3590310f17
[formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]
Former-commit-id: 3590310f17
Former-commit-id: 0f9e0b343d
2013-05-22 16:13:08 -05:00
Steve Harris
026674d0b2
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: dce0dc3692
[formerly 097617fa26
] [formerly 462652e31e
[formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]
Former-commit-id: 462652e31e
Former-commit-id: 299690a202
2013-05-22 16:10:04 -05:00
David Gillingham
2e6f7c8250
Issue #2025 : Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest.
...
Change-Id: Ie9e58a139eed869a0483a475974ed4b733711bac
Former-commit-id: cf1f45d77f
[formerly 8e8d71dc2f
] [formerly d5895e23c7
[formerly d6c6f3f9a6d7d37f22af82984d0d75937b4415cc]]
Former-commit-id: d5895e23c7
Former-commit-id: 0e1135ac1f
2013-05-22 15:48:32 -05:00
Steve Harris
b745b332ae
13.4.1-12 baseline
...
Former-commit-id: 397bbf674a
[formerly 6a97b4325a
] [formerly e53ada66b8
[formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: e53ada66b8
Former-commit-id: bd4f93e859
2013-05-22 16:42:39 -04:00
Benjamin Phillippe
8cae1b56f1
Issue #2022 Removed data delivery project from feature
...
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd
Former-commit-id: 0308f217d6
[formerly 4d1252523e
] [formerly 3e9fe9892e
[formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]
Former-commit-id: 3e9fe9892e
Former-commit-id: ce20ead9e7
2013-05-22 12:49:46 -05:00
David Gillingham
1471a7fa34
Issue #1759 : Fix regression to ISC request reply due to missing import.
...
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80
Former-commit-id: 2555cf9819
[formerly 5cba0f5e40
] [formerly 801c659108
[formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]
Former-commit-id: 801c659108
Former-commit-id: 60aeb71652
2013-05-22 11:42:08 -05:00
Benjamin Phillippe
1c50a8b9d3
Issue #2022 Added registry federation capabilities
...
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028
Former-commit-id: 7a908bbeaf
[formerly b9f2bde20e
] [formerly c3a376475b
[formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]
Former-commit-id: c3a376475b
Former-commit-id: ad039bae0c
2013-05-22 11:38:42 -05:00
Brad Gonzales
6d483764e3
Issue #1965 Add org.apache.commons.io package to cots.
...
Change-Id: Ib444054da83b7e7d6062c84e3e1a705a3d4f63ed
Former-commit-id: 33045d73a6
[formerly 4bc98160ab
] [formerly 598a7a221e
[formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]]
Former-commit-id: 598a7a221e
Former-commit-id: 858f68fc5c
2013-05-21 16:29:01 -05:00
Richard Peter
1bbddf8fdf
Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
...
Former-commit-id: 62c8176486
[formerly c9c1570960
] [formerly b4344d3c04
[formerly 6c7371738300221d0d861ef10bb904a483d0655c]]
Former-commit-id: b4344d3c04
Former-commit-id: 489fdf49b1
2013-05-21 13:07:51 -05:00
Greg Armendariz
cd96d6d2e6
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
...
Former-commit-id: fce1512b37
[formerly 20a9ad95e5
] [formerly eecbf2718a
[formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]
Former-commit-id: eecbf2718a
Former-commit-id: 525cd5c751
2013-05-21 12:24:19 -05:00
Richard Peter
76f11f00ae
Merge branch 'omaha_13.4.1' (13.4.1-11) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java
Former-commit-id: 3d84e1dd53
[formerly 8aa4b0025c
] [formerly 930ff50fb8
[formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]
Former-commit-id: 930ff50fb8
Former-commit-id: 81ae3ea8bf
2013-05-21 12:11:21 -05:00