Commit graph

2222 commits

Author SHA1 Message Date
Dave Hladky
13137a0a9a Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]]
Former-commit-id: 45059e722a
Former-commit-id: 883febe498 [formerly 117a3953af] [formerly 28cb7341b151f55976a91b298b2eaf8e4e117a17 [formerly ae84d2991e]]
Former-commit-id: 5061f97fcc5146801882be2758be31c8f5835bed [formerly 6c83fd0929]
Former-commit-id: 4ce5dfcd92
2014-04-21 12:26:47 -05:00
Richard Peter
035ae1718c Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
Former-commit-id: b15fd4c2f5 [formerly dc41da4a65] [formerly 9dc957f1a1] [formerly b15fd4c2f5 [formerly dc41da4a65] [formerly 9dc957f1a1] [formerly 1e33125cb7 [formerly 9dc957f1a1 [formerly 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6]]]]
Former-commit-id: 1e33125cb7
Former-commit-id: 38a49e1def [formerly 5dd87d4b5d] [formerly 40c6a9799a15c274aacb422a4ee8ce45b2d57506 [formerly 4e71d9e099]]
Former-commit-id: 016a8930369d4f9afc64131669d99ff45c557af2 [formerly 68df58fb03]
Former-commit-id: 8768811fde
2014-04-18 15:15:13 -05:00
Benjamin Phillippe
50fd573a75 Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5

Former-commit-id: f4169e4e0c [formerly b0d162ccba] [formerly b2686e46cf] [formerly f4169e4e0c [formerly b0d162ccba] [formerly b2686e46cf] [formerly b86fae838f [formerly b2686e46cf [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]]]
Former-commit-id: b86fae838f
Former-commit-id: d44b84bdbc [formerly 1d600c8559] [formerly 6f37719194fea49780dffc9b608b92540757b08a [formerly d8408a9b3f]]
Former-commit-id: d6efca7ac67e33e080e4754a0bc9c5180bf53e82 [formerly 201f25eab3]
Former-commit-id: 160f48406a
2014-04-18 15:10:46 -05:00
Brian.Dyke
b52ab83c26 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 2d8d035b26 [formerly 3b90abdf7a] [formerly 880329e4ae] [formerly 2d8d035b26 [formerly 3b90abdf7a] [formerly 880329e4ae] [formerly 9943a331c3 [formerly 880329e4ae [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]]]
Former-commit-id: 9943a331c3
Former-commit-id: 54e2d33607 [formerly 2c8e6ec2fc] [formerly 194874486fb70da3d52cfd624f3ead46e0ca7eef [formerly 62c2a8b843]]
Former-commit-id: e6549328a0648837593fbf13ac5bc4de370dc1f7 [formerly 989b873f6e]
Former-commit-id: ddee08368a
2014-04-18 07:53:10 -04:00
Nate Jensen
c40115ef80 Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: 52e4a94bb3 [formerly 9ebedf0b98] [formerly d121f07e76] [formerly 52e4a94bb3 [formerly 9ebedf0b98] [formerly d121f07e76] [formerly e0ae9e5f8f [formerly d121f07e76 [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]]]
Former-commit-id: e0ae9e5f8f
Former-commit-id: ef5448e8f9 [formerly 736c2cc764] [formerly 77ce898f6def28352aefa08188156dd2bc89176b [formerly e0ffa7b6b4]]
Former-commit-id: 652809268dc177578cdc57e167bee3c9e728fe1b [formerly 700080e879]
Former-commit-id: 7031f73fe2
2014-04-16 08:41:54 -05:00
Ron Anderson
861aaf0dfa Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]]
Former-commit-id: 9f085a0856
Former-commit-id: c263058e63 [formerly a6fa60f40d] [formerly 4b1dcfa5f1e94d0867e4b137f8e3643f96ecc196 [formerly 4622ad9b8a]]
Former-commit-id: c311f1a789e254f3b8d8c63514a373eb8b409c06 [formerly 56a1b8b682]
Former-commit-id: 072102dff0
2014-04-15 17:22:12 -05:00
Ben Steffensmeier
76c12afbfe Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 2c5ef01980 [formerly 49ca556b33] [formerly ecbe6fd2d7] [formerly 2c5ef01980 [formerly 49ca556b33] [formerly ecbe6fd2d7] [formerly 6ea38cfbb2 [formerly ecbe6fd2d7 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]]]
Former-commit-id: 6ea38cfbb2
Former-commit-id: 68df2b0d29 [formerly 2f51d63032] [formerly 305f259935e7d3b0c4aa6d31fb2c63c47d11a7ad [formerly 3eebc7a864]]
Former-commit-id: 003a747a5ae4b41830eb3012aa75e88ce095a4b1 [formerly af826302a1]
Former-commit-id: 7dc8709a5b
2014-04-15 13:29:05 -05:00
Steve Harris
1c13496912 Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 9ff3077435 [formerly 9132d9004e] [formerly eb2f2865fe] [formerly 9ff3077435 [formerly 9132d9004e] [formerly eb2f2865fe] [formerly 5bf5bdb6b0 [formerly eb2f2865fe [formerly f4c8ce899d312b389aff32d052564559e79904be]]]]
Former-commit-id: 5bf5bdb6b0
Former-commit-id: 1f3584ce15 [formerly 6ed279d306] [formerly 336570a6f023ec3889bbe8c27489ce1f1e14b5f5 [formerly c361ccd531]]
Former-commit-id: 6ae45c7f072308154e9a43cc9868ef69a835f969 [formerly 9be8c87f87]
Former-commit-id: ac077b24a1
2014-04-15 09:39:33 -05:00
Benjamin Phillippe
372ecda418 Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109

Former-commit-id: 575caa6238 [formerly 490413551b] [formerly 3db751fc5b] [formerly 575caa6238 [formerly 490413551b] [formerly 3db751fc5b] [formerly 62062bf288 [formerly 3db751fc5b [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]]
Former-commit-id: 62062bf288
Former-commit-id: f731dbc847 [formerly 0b149f92d9] [formerly 9f938a2b9dba7afb0360199c813d48ea9302801b [formerly 035272360b]]
Former-commit-id: 001d47f93bc4e0c26d0f78e7d14ece5b5ef7a34f [formerly f6f51d3575]
Former-commit-id: f026a17b07
2014-04-15 09:15:12 -05:00
brian.dyke
16be9500b9 Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly a6708cc174 [formerly fb1c399d4d [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]]
Former-commit-id: a6708cc174
Former-commit-id: 627004af0a [formerly e8dffad9cb] [formerly c50a848c670c4b4d84b5ed17c503151cf6c6b7f1 [formerly 5b27f2987f]]
Former-commit-id: 4e673bda45fe4b6268410b72231d4d0d2ad7d4bb [formerly d148fbe645]
Former-commit-id: 6a5c7d7684
2014-04-14 15:29:23 -04:00
Zhidong.Hao
0f1a1e52a7 ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1

Former-commit-id: a153f7218e [formerly f5877f5fb0] [formerly 0b499061da] [formerly a153f7218e [formerly f5877f5fb0] [formerly 0b499061da] [formerly 9c18f60924 [formerly 0b499061da [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]]]
Former-commit-id: 9c18f60924
Former-commit-id: a8eaf88994 [formerly 3adcd5bca5] [formerly 0eb35c20c9f879386db51a895123b7b5435e2d64 [formerly 13808687c1]]
Former-commit-id: a1c719e81d4d018bd8ddb252c1e0303980194856 [formerly 7996e95745]
Former-commit-id: 2b0fd93679
2014-04-11 15:51:12 -04:00
Zhidong.Hao
ac40440ce5 ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c

Former-commit-id: 8e54cb2958 [formerly 48ee7712c7] [formerly 009c6e067a] [formerly 8e54cb2958 [formerly 48ee7712c7] [formerly 009c6e067a] [formerly 1a91b820d9 [formerly 009c6e067a [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]]]
Former-commit-id: 1a91b820d9
Former-commit-id: 531eea30e1 [formerly ab0c9a65d2] [formerly 3276287380788647756570a048989a84fecfcd89 [formerly c6d9a3926e]]
Former-commit-id: 2be119384e43516b510a208409a4f3c49e88e8d7 [formerly a94bf1a110]
Former-commit-id: a846d4c4f5
2014-04-11 15:34:06 -04:00
Brian.Dyke
f77319aa5b Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 70e228a893 [formerly afc1da9015] [formerly 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]]
Former-commit-id: 9404d535e7a6fa45f9825f9c281883c24eedc7c4 [formerly f051b95a7a]
Former-commit-id: fbefee3e1d
2014-04-10 13:26:42 -04:00
Richard Peter
52a54f5e9f Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
2014-04-09 16:00:54 -05:00
Brian.Dyke
38a8f60a43 Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]
Former-commit-id: 929b736038
Former-commit-id: a6ebdbfc3a [formerly d76d3a26cb] [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]]
Former-commit-id: 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb [formerly 462952ce65]
Former-commit-id: 8ef50f023b
2014-04-09 11:39:07 -04:00
Brian.Dyke
ae3f5dbff6 Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
2014-04-04 12:57:32 -04:00
Richard Peter
0f5b3cac88 Issue #2509: Fix stitched grid notifications
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4

Former-commit-id: 9536a08425 [formerly bfba75f73f] [formerly 53d5000261] [formerly 9536a08425 [formerly bfba75f73f] [formerly 53d5000261] [formerly f99875040c [formerly 53d5000261 [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]]]
Former-commit-id: f99875040c
Former-commit-id: e5d60b407e [formerly b32eff04be] [formerly 3bea8ffc56d67fe6dc2c1ddee99339d81e83daf9 [formerly 9ac8af6ccd]]
Former-commit-id: 9575cdb8abaeca9e6ef7c1d01a633480180e775b [formerly 154034d653]
Former-commit-id: 034e62d64e
2014-04-01 14:44:05 -05:00
David Gillingham
be6e42d91b Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9

Former-commit-id: d14aee89aa [formerly 402adfeddb] [formerly a529bc8cad] [formerly d14aee89aa [formerly 402adfeddb] [formerly a529bc8cad] [formerly 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]]]
Former-commit-id: 70b28b4e1e
Former-commit-id: 13017ce731 [formerly 64981356c8] [formerly a8749ff88e3ad01c4b1fec62d193a19acac4a3ef [formerly 22266d36b9]]
Former-commit-id: b2a35016bf9e27eefdf55483242773ab74367055 [formerly 3ad0872bda]
Former-commit-id: 14f927fe54
2014-03-31 15:49:33 -05:00
Brian.Dyke
dedbdef64c Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]]
Former-commit-id: 3b639347f8
Former-commit-id: bded86a35f [formerly 519ec3071a] [formerly 38694ae3f3f4b7b74544ffa190d887b7c937b26b [formerly 76625c2238]]
Former-commit-id: b11ad5967e376b34076f85e49fab9f19d3ad22e5 [formerly 9fa73765f9]
Former-commit-id: 102414db3a
2014-03-27 10:22:26 -04:00
Steve Harris
9659705737 Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 3b8569a1ac [formerly 311c8d67af] [formerly 9e1c5536bf5208e6e617f1b651bab6961954548a [formerly 55440888fd]]
Former-commit-id: 3aca6b03a25eacf45ba5d9bfa520a245475f2946 [formerly af32adebc5]
Former-commit-id: ef058152a0
2014-03-26 15:51:32 -05:00
Richard Peter
989ac3147f Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: d4c67a0f8c [formerly 6236137635] [formerly 390e73af44] [formerly d4c67a0f8c [formerly 6236137635] [formerly 390e73af44] [formerly 897980da08 [formerly 390e73af44 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]]
Former-commit-id: 897980da08
Former-commit-id: 5dd2d089bb [formerly a910870531] [formerly d757b784318130cb248a48533db6e16ad9554e32 [formerly 780b504251]]
Former-commit-id: 1d59c583c016450694956f5445ba6500a32927d7 [formerly 9060aab6dd]
Former-commit-id: 631aa74a10
2014-03-24 09:53:13 -05:00
Dave Hladky
a6d07e82a6 Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: c978694653 [formerly e464a1d8f8] [formerly 52a66b8f177ba3fcebbd8fee9b4e8b300ae9ba10 [formerly 43cbcff538]]
Former-commit-id: a34ec85b7be5311fc6e20f3d93ca82b2276e2023 [formerly 3d61ca32f6]
Former-commit-id: a37f87968c
2014-03-24 08:27:12 -05:00
Mike Duff
b1e31e388d Issue #2941 - Sort data before returning
Former-commit-id: d7d06e18fd [formerly ff07b90659] [formerly 73a011b940] [formerly d7d06e18fd [formerly ff07b90659] [formerly 73a011b940] [formerly 4db73e42a5 [formerly 73a011b940 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]]
Former-commit-id: 4db73e42a5
Former-commit-id: b26be09c49 [formerly 8d1347d1f7] [formerly c59574ba2d086ee6c90dd15718f0f7b5869fb8e2 [formerly 43eccead7c]]
Former-commit-id: cb740913b5439b8346144311c9578671ffd048c4 [formerly 8f00b37688]
Former-commit-id: 05fbcc61ca
2014-03-24 08:19:21 -05:00
Brian.Dyke
91da395a71 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: 402035e7f9 [formerly d97b88f433] [formerly 1a63c19999c01830d72a5d605c2cc1247fc3b4eb [formerly 14567f20a7]]
Former-commit-id: 2c253da743c15a00910b72d8aac49c5cbb6f5609 [formerly f540c6fb2d]
Former-commit-id: aea0544eec
2014-03-24 07:01:29 -04:00
Brian.Dyke
1f96787564 OB_14.1.1-24 baseline
Former-commit-id: 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]]
Former-commit-id: face1ebeeb
Former-commit-id: 49f7c81de1 [formerly cfa058a345] [formerly 96a438276ab6f5a4af7ac304e214e79258c0ea3d [formerly 6b2175da93]]
Former-commit-id: bd70e5cfe36861d8349138232ac519963886caa3 [formerly 2fda566cfb]
Former-commit-id: 7aeb9af309
2014-03-21 12:43:50 -04:00
Brian.Dyke
f95e1ed18b Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 39ef07d49f [formerly 57f7e4b084] [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]]
Former-commit-id: b74e99a753d5ddafa0c2b9e7a7ee76f3251376c4 [formerly 35427557c4]
Former-commit-id: 5fb2fe9266
2014-03-14 11:13:30 -04:00
Brian.Dyke
b6b38c0121 Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly f999e48df0 [formerly d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]]
Former-commit-id: f999e48df0
Former-commit-id: 86ec9a50d4 [formerly 82756e3855] [formerly 2bdb02ad2c8ccb7c77ded0fd2df41688dea93867 [formerly 3ab2df3507]]
Former-commit-id: 1bf9fe1b47eeea3a212497f6320423ebad1117f1 [formerly 76271269c5]
Former-commit-id: 516ba8e81a
2014-03-14 08:44:39 -04:00
Brian.Dyke
f417ded1bb OB_14.1.1-23 baseline
Former-commit-id: b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]]
Former-commit-id: bc6a7bf946
Former-commit-id: 6c021d0eec [formerly e78e030b7c] [formerly ea51c2c24eabbc975758d2dfad3f260a10c7718d [formerly 8f72db144b]]
Former-commit-id: 15a710f2de86297f2fae98fe2c109c5d01b1953d [formerly c7fbd5dfe4]
Former-commit-id: be8f052cff
2014-03-14 08:18:16 -04:00
Ben Steffensmeier
b6b13cea10 Issue #2528 Fix satellite units/style.
Former-commit-id: eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly 75120a09cd [formerly 77041e5b17 [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]]
Former-commit-id: 75120a09cd
Former-commit-id: 82a8490dfc [formerly e2995114dc] [formerly b6272ae932f2784e4677fe602769adb1fef911b2 [formerly d29daf8ede]]
Former-commit-id: 3fdb707afe0c7c8354db1df1089d473246d1649a [formerly fc62e2679d]
Former-commit-id: 1bde438f3a
2014-03-12 14:19:49 -05:00
Richard Peter
64feddc462 Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly f59d1433db [formerly 18234c5d73 [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]]
Former-commit-id: f59d1433db
Former-commit-id: 90f3b627af [formerly cc35481b48] [formerly 5f03de8c59b4bb9535d972f40d6cc693c365c3da [formerly 76f15c73dd]]
Former-commit-id: ff2e21df08c5b0602d23df7b135c00450a1c40da [formerly 937c89866d]
Former-commit-id: 318c61b1bf
2014-03-11 16:43:37 -05:00
Dave Hladky
177e76f996 Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly 76e216d319 [formerly 3500ad262a [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]]
Former-commit-id: 76e216d319
Former-commit-id: 39cc47bc52 [formerly f3876233e4] [formerly 28b9b16fdbb85a6e9a3afb5298b0813e917a59b1 [formerly 03fd32144a]]
Former-commit-id: 451a7125613fe9ce3c298e07c814874021718d47 [formerly c0d2eb8f6b]
Former-commit-id: 78441a1250
2014-03-11 15:53:59 -05:00
David Gillingham
7c4f0bcee6 Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 187196b519 [formerly b0783b64ce [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]]
Former-commit-id: 187196b519
Former-commit-id: 6fcb5b7e73 [formerly 4179172d0e] [formerly e949b41e8ce1e7c37f0f510cdbbac24e2438f30d [formerly 68edb8d9a1]]
Former-commit-id: db669e661b0dcdd0789172fe8a31d92ad669695d [formerly f30292b471]
Former-commit-id: 0e0fdae804
2014-03-11 11:54:25 -05:00
Juliya Dynina
98b24cf46b Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: 2b55a4240e [formerly b3ec4c363f] [formerly 6bbd88e62c] [formerly 2b55a4240e [formerly b3ec4c363f] [formerly 6bbd88e62c] [formerly 7952862443 [formerly 6bbd88e62c [formerly a167748b77baad66784893304a18e8866f5471f1]]]]
Former-commit-id: 7952862443
Former-commit-id: d1b202fcd0 [formerly bedc9082b0] [formerly 30b12a7237013355ab82100b5cd40d97cfd766da [formerly 7e35f36651]]
Former-commit-id: 187c2bed7707310ed1c946986736df1dabeef617 [formerly 7966aac771]
Former-commit-id: ddf1c4f4f6
2014-03-11 09:24:12 -05:00
brian.dyke
3b1dd43698 Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]]
Former-commit-id: b1b216f196
Former-commit-id: 41a37605d4 [formerly d1b389ae05] [formerly 9bef04b7d89a16100ee76d159ab4225ead55540a [formerly d57a3dd24c]]
Former-commit-id: db4eabc17ce8b18f073611f9c641761f09467a04 [formerly f3df3e3690]
Former-commit-id: fba0188c90
2014-03-10 15:36:56 -04:00
Steve Harris
3348f6857a Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324 [formerly 4d1fbf8743] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320]
Former-commit-id: e29b96b6bd
2014-03-07 15:16:18 -06:00
Shawn.Hooper
671d334f18 ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: bd02f6a1a6 [formerly e894b1279a] [formerly 41a4905f9f] [formerly bd02f6a1a6 [formerly e894b1279a] [formerly 41a4905f9f] [formerly 56a949fba8 [formerly 41a4905f9f [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]]]
Former-commit-id: 56a949fba8
Former-commit-id: 1acdbf20f2 [formerly 84b71d7252] [formerly 8e558f4668f969675b3426aa8d9a1fd8674746ec [formerly aa827610b1]]
Former-commit-id: 16550e6ebdc23f503b230c433c6ada3ea1da148b [formerly fb673d390f]
Former-commit-id: df59dabcb5
2014-03-07 14:53:54 -05:00
David Friedman
87ed26568e ASM #349 - Workaround for QPID-5569
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: b8aadf1781 [formerly 103fece7b7] [formerly 2c1a3442d6] [formerly b8aadf1781 [formerly 103fece7b7] [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 2c1a3442d6 [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]]
Former-commit-id: a58f3cb7df
Former-commit-id: 951bd668ae [formerly 91b22ff9bb] [formerly 38bf85175bedb3976ea85ab928e8bdea8f6e4a64 [formerly 2a4a92c223]]
Former-commit-id: e4fe776694b8d4beb5605017347016019fb2ec75 [formerly ab5f533c72]
Former-commit-id: 2eb0b3dfb0
2014-03-07 14:58:09 +00:00
Steve Harris
a19beb1e5d Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
2014-03-06 08:39:43 -06:00
Benjamin Phillippe
d51e7a67a0 Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 7ad21da089 [formerly 7bf51d507e] [formerly 59323be87e] [formerly 7ad21da089 [formerly 7bf51d507e] [formerly 59323be87e] [formerly 9fd35140f0 [formerly 59323be87e [formerly a265027cacde7690171d30455227c5a843e0d397]]]]
Former-commit-id: 9fd35140f0
Former-commit-id: fe6d70a38f [formerly daeb8bec5f] [formerly 5c8dacb79a884329e899f0613609bd34935428e9 [formerly cd04d7dcbe]]
Former-commit-id: 80271981040d34f22e2ae5038a50b6a25a0fe9ba [formerly 6b6a5b0e4f]
Former-commit-id: d0999c05e8
2014-03-04 13:31:41 -06:00
Richard Peter
f451950ced Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: 2b5339e16f [formerly 5280398130] [formerly aa8e1a3625] [formerly 2b5339e16f [formerly 5280398130] [formerly aa8e1a3625] [formerly f9bd27c061 [formerly aa8e1a3625 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]]]
Former-commit-id: f9bd27c061
Former-commit-id: 75f96fe190 [formerly a81447f434] [formerly d8b132631aeda3ce7743ca02d1af158db917cca9 [formerly 3b800bcc09]]
Former-commit-id: 3fe7fe9495699d8d98fce4cdb1e4d967ad5f3330 [formerly 9ce19b16cc]
Former-commit-id: 0219b80555
2014-03-04 12:54:23 -06:00
Nate Jensen
587d8e5e1b Issue #2813 fix subscription package names
Former-commit-id: 645fec513a [formerly af76b58b27] [formerly 0ec866f1d2] [formerly 645fec513a [formerly af76b58b27] [formerly 0ec866f1d2] [formerly d7d0803ee9 [formerly 0ec866f1d2 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]]]
Former-commit-id: d7d0803ee9
Former-commit-id: b920fdd0aa [formerly 78b2b50370] [formerly d585d2501f41607fabbcad8c30a1a4244b7f07c5 [formerly df44f8246e]]
Former-commit-id: e577998904a8996099ae83537da7ff39cf515283 [formerly e22b486f25]
Former-commit-id: 5132a0f8cb
2014-03-04 10:53:58 -06:00
Brian.Dyke
c8111a7ebb OB_14.1.1-21 baseline
Former-commit-id: 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]]
Former-commit-id: 29681c7ca4
Former-commit-id: c1ef56e0d7 [formerly c68649b4f9] [formerly 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5]]
Former-commit-id: db6e513aaa9a15a7b11a5aee1b3716c9a5587928 [formerly 079cc93f89]
Former-commit-id: ea56516bf5
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
eb7e448d08 Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: ea31c5b370 [formerly d339e232f4] [formerly ed050996a2] [formerly ea31c5b370 [formerly d339e232f4] [formerly ed050996a2] [formerly 5483d6d7ae [formerly ed050996a2 [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: 71d5fbda33 [formerly 603e433054] [formerly d73e719f11d2bc9e27c664078a07b85c55da2615 [formerly 15a5e7c4a4]]
Former-commit-id: 63cf34563d5f8d452ff9585e79b5e00f900f9f9c [formerly 090dbe3918]
Former-commit-id: 719b90e1e7
2014-03-03 10:57:16 -06:00
Brian.Dyke
7316b34ef5 OB_14.1.1-20 baseline
Former-commit-id: 2613e13e08 [formerly b2401d2f0d] [formerly 324696c436] [formerly 2613e13e08 [formerly b2401d2f0d] [formerly 324696c436] [formerly 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]]
Former-commit-id: 2bad40cfee
Former-commit-id: 89b66fcb5b [formerly c873f20d04] [formerly ed8e6914deb29235289414c9240bc93a504f11a5 [formerly 16117255f3]]
Former-commit-id: 9b0f4d8a2c398c18300fab2c3d13cb0bf783a1ef [formerly 5feadbe4d9]
Former-commit-id: f9587d39d1
2014-02-26 17:39:15 -05:00
Richard Peter
aac768e805 Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: 2c433bb05c [formerly 90b48e0393] [formerly 3735cd3ffe] [formerly 2c433bb05c [formerly 90b48e0393] [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 3735cd3ffe [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]]
Former-commit-id: b4e48698ed
Former-commit-id: 85a16601ed [formerly f803d557c2] [formerly d78cc4dd432220d2d29a4c19ab555ecd83067517 [formerly 66b271a550]]
Former-commit-id: 5b87edac1a20018c339b438ff189f180ab2dc96a [formerly e78e5a15b9]
Former-commit-id: e28b3bb5b9
2014-02-25 12:34:38 -06:00
Brad Gonzales
ac050068d5 Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 8b2b50baaf [formerly 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: c364269fae [formerly f57f472f6a] [formerly 0b393405d83191a17ccf6537e803d672cbc79eae [formerly 5ce1939d01]]
Former-commit-id: 4945cd39a9cc275d1c7a6df8d10b99e4aea2962c [formerly f4513d0e64]
Former-commit-id: aa2d8b76a1
2014-02-25 09:22:08 -06:00
Brian.Dyke
9db7ca881a Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014]
Former-commit-id: 0bcf7c89b8
2014-02-24 14:51:00 -05:00
Ron Anderson
5eb76e8ed6 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: 5831f8d79e [formerly 7d3af157f8] [formerly a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]]
Former-commit-id: 50ec6dfad53c87f1ad4174e64fdb142803fcaf62 [formerly f2b0cc20e8]
Former-commit-id: 3c673caec2
2014-02-24 13:46:48 -06:00
Nate Jensen
0d8cd5360a Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly b1586f8603 [formerly 2111109ce2 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]]
Former-commit-id: b1586f8603
Former-commit-id: 1837a83743 [formerly d6e9cb73f5] [formerly 9d8fe1a0158253d440a5c43e42535da472859450 [formerly bf8bb95f51]]
Former-commit-id: 6f49258d52063f413dae43a0a944ac2785e75d66 [formerly 6979321635]
Former-commit-id: da2a363550
2014-02-24 13:25:35 -06:00
Dave Hladky
2ed6aabcb0 Issue #2469 Fixed default rules implementation
Former-commit-id: d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 1d256bfcee [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]]
Former-commit-id: 45413d0db4
Former-commit-id: 05c81677d2 [formerly dc97eb7890] [formerly 3d6c4cab1cd2a6a85a35b82eb0d57119b5630f76 [formerly ff5a5961db]]
Former-commit-id: ca019feb8178be88e796a82d279fda02bcfa070a [formerly 8a924bcc2c]
Former-commit-id: e030ac65b2
2014-02-24 13:06:52 -06:00