David Gillingham
5d19a4dff7
Issue #1447 : Initial commit of VTEC table sharing functionality: port A1 changes to
...
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.
Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510
Former-commit-id: e2a7d7a350ca81ae4a7150744c1f92e2a7d7a350ca81ae4a7150744c1f929351f33c1c50744c1f929351f33c1c3b9b6e1df6622700dee977a3f33fd54f6b2ffcff861a3d0c44
2013-03-01 11:05:02 -06:00
Max Schenkelberg
805eacaa9a
Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
...
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62
Former-commit-id: 0fb8bb14d21769edc026ec40d261e50fb8bb14d21769edc026ec40d261e5547c593decec40d261e5547c593decb6a0a31731fc58e7431a13a40563350c8f3d24493dcfc90510
2013-02-27 16:19:58 -06:00
Bryan Kowal
cebfff6ed4
Issue #1662 - wrapper parameters can now be used to specify the order
...
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters
Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c
Former-commit-id: 1b65ae19675b3478d6c78bf5e3ffad1b65ae19675b3478d6c78bf5e3ffad44349717fb8bf5e3ffad44349717fb5231011f8c65fb00c3c34f7fed259cdc46b8eeb18210c0d984
2013-02-27 12:46:48 -06:00
Max Schenkelberg
9b89da117c
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: d0b78507752611980ca44ed4ef8d71d0b78507752611980ca44ed4ef8d71e0ba97d5474ed4ef8d71e0ba97d5472aef608c3f5617dfaa676b1426dd34453ac440501073393fbb
2013-02-27 11:50:38 -06:00
Ron Anderson
690755510b
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: 547f0d086fd43afc8c67bfe3c684df547f0d086fd43afc8c67bfe3c684dff37999b1ebbfe3c684dff37999b1ebdc8d1dd95c541557e0b077fbbb6a6192abcad34959c7ee5120
2013-02-26 18:44:51 -06:00
Nate Jensen
02b44369f4
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: eb2e9f64f415c4c4dfa0b062299796eb2e9f64f415c4c4dfa0b06229979636d4eff2c6b06229979636d4eff2c65853f48992b173d34ba95c33098315c06d4abcee360b33b854
2013-02-26 13:53:40 -06:00
Matt Nash
ab25be3e1c
Issue #1668 add gsd pattern to allow for their plugins to be deployed
...
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: 9dc4390b7e41bbd4cf2da2fb0db6849dc4390b7e41bbd4cf2da2fb0db684051b36ad73a2fb0db684051b36ad739ac60409d632096feba8b1fe380c441c51407ffd2841c495af
2013-02-26 13:29:04 -06:00
Dustin Johnson
1b880d1178
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: eaa295dddbebf02481f0d58d28c636eaa295dddbebf02481f0d58d28c636722e41b8b0d58d28c636722e41b8b0e6d447b00d219e882fc5cf86c92fadb62631b9d1fa87f70100
2013-02-26 11:32:03 -06:00
Steve Harris
86c1edf4ea
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: 650db426b9cd99e680bbb50e384a0f650db426b9cd99e680bbb50e384a0fe8135b9c14b50e384a0fe8135b9c14e4b9ef2cd3901cbbf56d2398ef1e851d8b6e0256108abd5e69
2013-02-25 16:05:22 -06:00
Steve Harris
9d9a17aa64
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 90b0bab1560a4564eb9767f090638f90b0bab1560a4564eb9767f090638f6ec9e7303567f090638f6ec9e73035f30d1cdf87e46625f8f20051276ad1140ae3191c9db68d0585
2013-02-25 15:58:48 -06:00
Bryan Kowal
e9cbfb8c57
Issue #1634 - fix EDEX debug with YAJSW Wrapper
...
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: 1ea7fbe69e4d160993fbb05073fbe31ea7fbe69e4d160993fbb05073fbe30d2262c0bfb05073fbe30d2262c0bff4bf7e1adbf8c920c6cd36a887416febe04d4919e38658e939
2013-02-25 11:30:13 -06:00
Steve Harris
dbaeb28c82
13.3.1-2 baseline
...
Former-commit-id: 0b3acc01303e60b23072df6d6f598e0b3acc01303e60b23072df6d6f598e3d115ed3bedf6d6f598e3d115ed3bef2428e968a370ed98038e8a51dc7802a2a9e03b7a43233f8c2
2013-02-25 10:18:36 -05:00
Bryan Kowal
18b7aaed49
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 6f419ae22f4cd5453e0a7c62991edf6f419ae22f4cd5453e0a7c62991edfd5c8b829417c62991edfd5c8b82941ec53fa98cd53b9e698685a5914c010fd17273cb2dd7eda15aa
2013-02-22 09:28:37 -06:00
Steve Harris
34d0f59592
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: abdc73315164744fdb19a0573644c4abdc73315164744fdb19a0573644c42641d578e2a0573644c42641d578e27e48d3e6844f155a183a33dd2589f1f3c3191a1cb5d9e75b95
2013-02-21 15:41:39 -06:00
Bryan Kowal
55b55a1255
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 0d4a63efe4519ce2c0fba8fb04f41c0d4a63efe4519ce2c0fba8fb04f41c803397c7c7a8fb04f41c803397c7c76a47017449b2a0a7c148450e8e7a4c2a21f2624bb88a24574b
2013-02-21 13:55:28 -06:00
Steve Harris
067dfcb980
13.3.1-1 baseline
...
Former-commit-id: 9bdd52a62696768407a50563d7ac189bdd52a62696768407a50563d7ac18cabc8cf8b40563d7ac18cabc8cf8b496c7269df00569ff413d92e4c7ba19654f15be5c07e4e4c8fb
2013-02-21 09:36:59 -05:00
Steve Harris
fac2d20002
13.3.1-1 baseline
...
Former-commit-id: e0406d31838ae397085e71e8990021e0406d31838ae397085e71e8990021d2a654625f71e8990021d2a654625fdb712e1fcfe4435815c946d28be4a4b3b56830b08c828dbd75
2013-02-20 16:19:40 -06:00
Dustin Johnson
6924e0f530
Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO
...
- Change new registry modes to explicitly list includes/excludes.
- Add separate bandwidth manager creation capabilities for NCF and WFO.
- Add deltaScript to add a "route" slot to subscriptions.
- Remove unnecessary schemas from Spring files.
Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa
Former-commit-id: 597908f34dd4afef2cabd8659e742e597908f34dd4afef2cabd8659e742ec8760e5699d8659e742ec8760e56990c7c2a6abd5a8b6459d4ca721863be5ffa5f410e2565df8435
2013-02-20 10:42:51 -06:00
Dustin Johnson
6b6de2a7af
Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes
...
Amend:
Use ref syntax with uri.
Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062
Former-commit-id: 8532c284612a588688b1cc598094fa8532c284612a588688b1cc598094fa116809346bcc598094fa116809346b8d32c1ee005ff63873683585482cad992a02d0000f1fcc9b5b
2013-02-18 15:47:17 -06:00
Richard Peter
3ba74383cd
Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
...
Former-commit-id: 69897b3aa2b3e2ca7b30a40ae4d8b269897b3aa2b3e2ca7b30a40ae4d8b2a6fa92923fa40ae4d8b2a6fa92923f720f324789774ea0ede65936f671ceb5706ca6cf107393f436
2013-02-15 16:33:00 -06:00
Ben Steffensmeier
2e69059ebf
Issue #1614 Refactor data access framework to use single request.
...
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: d35b79d537e7710762751393f3e3cfd35b79d537e7710762751393f3e3cf0933a5f5961393f3e3cf0933a5f596a0f06eff6991bbdc3337f0f3c71d50f868f66f76e6fc131343
2013-02-15 11:39:56 -06:00
Ron Anderson
46248d1c10
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: 9156b9ffe8dc7c9edb87a2a89fb4e79156b9ffe8dc7c9edb87a2a89fb4e77c0a5d74bfa2a89fb4e77c0a5d74bf12f2ac0171d69d628450e952a4f17945627edcc780df624bb3
2013-02-15 09:03:41 -06:00
Ben Steffensmeier
e09c344878
Issue #1614 allow locationNames for grid data access
...
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2
Former-commit-id: 31605a14aaef7addb005ab319bd3a831605a14aaef7addb005ab319bd3a89b4de367e3ab319bd3a89b4de367e3fb7100ddc2efaddb710c0995024482aecc5a69e92bcf3749ce
2013-02-14 10:07:01 -06:00
Matt Nash
1674ef3392
Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused.
...
Change-Id: I36d72ed9642752eb92ae0902892bd79810111c07
Former-commit-id: d2f552ea312bed543d321c504de33ed2f552ea312bed543d321c504de33eda21cf82e91c504de33eda21cf82e9cce03c6d4339f3f70e1bd39f0938e8a64fd038966f1596ab82
2013-02-12 12:02:48 -06:00
Dustin Johnson
d9fe43006a
Issue #1543 Add testing of current OpenDAP type retrievals.
...
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.
Amend:
Peer review comments.
Change to use Spring transactions.
Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366
Former-commit-id: c79c031f620d548bd66f8307af022cc79c031f620d548bd66f8307af022cef32853dc18307af022cef32853dc1ae6a45142273a5667256e504a474f9e48bf4882135b13ba973
2013-02-11 14:21:57 -06:00
Steve Harris
b43935a991
13.2.1-6 baseline
...
Former-commit-id: 52f48669f6d66ad2f77bd0752de66c52f48669f6d66ad2f77bd0752de66ca46e33f06ed0752de66ca46e33f06e5027d2365bbbe92e682430d38334cc0c128dd8f0dc55ef579a
2013-02-07 16:00:39 -06:00
Steve Harris
91ea402e4a
13.2.1-6 baseline
...
Former-commit-id: 9b7251d17ecc48fa4fc6b80782b0819b7251d17ecc48fa4fc6b80782b08153adfb7345b80782b08153adfb734512e0cd07f21f44caaedbdee148077316b7b742be46eee24352
2013-02-07 16:38:44 -05:00
Steve Harris
e91c865ccd
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 953bec4467da43a7a8ca4bc8e9ab5c953bec4467da43a7a8ca4bc8e9ab5c5ee47e098d4bc8e9ab5c5ee47e098d3ee627253fb119d66cda3ad515e28fd73efe8e86a11c8dff6d
2013-02-06 11:12:01 -06:00
Steve Harris
2ccf38754d
Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 44a428781214f23d4227a16ac7819c44a428781214f23d4227a16ac7819c6c6b53679ba16ac7819c6c6b53679b63b36d867048a0ffda4d28ddc9bad8f028c16f79f997ecea38
2013-02-06 11:08:53 -06:00
Steve Harris
6cef082440
13.2.1-5 baseline
...
Former-commit-id: 7e1236c17ca6b3cde1ff232734091d7e1236c17ca6b3cde1ff232734091d146fcc6da8232734091d146fcc6da85d64cfc2987497a15e221c602ec3a7bb0759d5adf36867a520
2013-02-06 11:02:32 -06:00
Bryan Kowal
77d006cc5f
Issue #1577 - deploy-install and AWIPS II ant task updates
...
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring
Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f
Former-commit-id: 874d75454381da18f8517815b651bb874d75454381da18f8517815b651bb5fea87f1dd7815b651bb5fea87f1dd285e192bd1efe288c82c99994d31512fafc6a34b2afa604676
2013-02-05 13:25:15 -06:00
Brad Gonzales
b27bb93cf7
Issue #1517 Added SPC Prob menu changes.
...
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 7cef72a46035cc853c74f459554e337cef72a46035cc853c74f459554e335bc6dd5498f459554e335bc6dd54983e4338339b8fc5c18ebdf3ef309293adbfa7ced17253bbf20e
2013-02-04 08:52:33 -06:00
Steve Harris
bafb9234f2
13.2.1-4 baseline
...
Former-commit-id: ed224fde88ae2859d5a28f2e7d4437ed224fde88ae2859d5a28f2e7d44370d7f53b6f48f2e7d44370d7f53b6f4d6b48ca4113f25b862c82998f750f40a4ef8c0845ae95b956b
2013-01-31 11:40:31 -06:00
Steve Harris
552c6528eb
13.2.1-4 baseline
...
Former-commit-id: 5acf001c1bf2b28cfa561beb655fa05acf001c1bf2b28cfa561beb655fa01e77a6f0bd1beb655fa01e77a6f0bda3bd6e4aec06f4b4ad5ae6e4de62470c67e2153fd52f193d7f
2013-01-31 12:05:59 -05:00
Steve Harris
a8d7e2a51a
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: f207d282bcc218786986658bea377bf207d282bcc218786986658bea377bec56acde81658bea377bec56acde8141b14f0fa273d9455c656383bf8ed2a74d58ce6f2107a54161
2013-01-31 10:19:14 -06:00
Steve Harris
3165545bb6
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e6093b159ee655d297f70505ed0a72e6093b159ee655d297f70505ed0a7260402725730505ed0a726040272573c9bc690eca75f6e61e6f513d49939fba9715113299bc358644
2013-01-29 15:57:21 -06:00
Steve Harris
d552dc5ffb
13.2.1-3 baseline
...
Former-commit-id: b84acc06da283147571ff45120a1f4b84acc06da283147571ff45120a1f47a739c6a5bf45120a1f47a739c6a5b03989493aedaca1c3e733edfa1e0bedbaf4a3e399ab34b7aeb
2013-01-29 15:52:43 -06:00
Steve Harris
5d7a0ba9af
13.2.1-2 baseline
...
Former-commit-id: 74bfe9595c0006a2b6cb7a7f7c45ca74bfe9595c0006a2b6cb7a7f7c45cac3e4551dfa7a7f7c45cac3e4551dfa0f4fcd0ba8251a9c01951153d80c5b27706b8dcbeafa141b90
2013-01-25 09:07:12 -06:00
Steve Harris
264b5bb073
13.2.1-3 baseline
...
Former-commit-id: 7d2e979c51a5a0da5c027435527b257d2e979c51a5a0da5c027435527b252b6ac028bd7435527b252b6ac028bdd069467e819d248cff7acc0fdef15c082e66584aab562e22a4
2013-01-23 11:24:17 -05:00
Steve Harris
b92dfd1b62
13.2.1-2 baseline
...
Former-commit-id: a4fa438a4133bc5fd81683e9157df7a4fa438a4133bc5fd81683e9157df7328c6dccad83e9157df7328c6dccadce726fadc7d9be4dce2147cc08ac79547c1dedd12779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb48d1aa77329771dfae6b11b05eedeb48d1aa77329771dfae6bc63f9bcae09771dfae6bc63f9bcae01d1791b3b48ed6a53113f6670806bf9146e727f908bf724a6c
2013-01-23 11:13:03 -05:00
Steve Harris
4ed4f88644
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: f1b3a0ce2ecf384edfbb11b9bfc187f1b3a0ce2ecf384edfbb11b9bfc1871af055a04b11b9bfc1871af055a04b7d6a1a7e3a8b578c10dc29b9077291b03d5ce450c60051d5df
2013-01-22 16:45:48 -06:00
Ron Anderson
e528aaab4c
Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
...
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58
Former-commit-id: 6f980bd58274cb9aeb5362671efc2a6f980bd58274cb9aeb5362671efc2a20b076104862671efc2a20b0761048c74a5b5be38e575db69c44807ba0d5cb23960f0e64d4baf536
2013-01-22 14:47:37 -06:00
Dustin Johnson
a2ca5bd06f
Issue #1441 Create new datadelivery services plugin
...
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.
Amend:
Rebase to HEAD of 13.2.1.
Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa
Former-commit-id: 40ef4c59473ec05a5a9c557de162b040ef4c59473ec05a5a9c557de162b015c2c55ff9557de162b015c2c55ff902604beac9756080321ea3c99f86bb21687135057da688f138
2013-01-22 11:45:18 -06:00
Nate Jensen
4049a63abe
Merge "Issue #1446 add getLatCoords and getLonCoords to python data access framework" into development
...
Former-commit-id: 8d00d8109d0edf7d7c9fe0896d8b5d8d00d8109d0edf7d7c9fe0896d8b5dec1d35251ce0896d8b5dec1d35251ca798f260da8f93ca0ed32a07d5c89f927f7e853b2a66e94209
2013-01-21 11:55:34 -06:00
Matt Nash
f8fec7da1f
Issue #1446 add getLatCoords and getLonCoords to python data access framework
...
Change-Id: I292a9b424cadf3033a861d8a0703b2f02946cd4e
Former-commit-id: 74377755f334ca95f039af22cf892974377755f334ca95f039af22cf8929b84af90fc2af22cf8929b84af90fc2155f7ccda60652c0840d177d02d01b2e6ba707e928f809e4a7
2013-01-21 11:51:18 -06:00
Nate Jensen
a7ec1dbff7
Merge "Issue #1486 : Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it." into development
...
Former-commit-id: a5b388edd8d725a2392236fc48eb53a5b388edd8d725a2392236fc48eb53d45d793d3636fc48eb53d45d793d365a1eb095e1e0452a81c7e969a8c4386400ecbe98977cf22051
2013-01-21 11:42:37 -06:00
Steve Harris
f8888e5294
Merge branch '13.2.1_delivery' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java
Former-commit-id: bf957a3bd789f3120c0c2c9c6b7ddebf957a3bd789f3120c0c2c9c6b7dde407d73a04f2c9c6b7dde407d73a04ff2b52084dc0ca985778ebbb637faf345760d8bef61a9f644d9
2013-01-18 10:52:29 -06:00
Steve Harris
f3e43ecb33
13.1.2-10 baseline
...
Former-commit-id: 5b617e763b683193255d68dde17de25b617e763b683193255d68dde17de286ea0b666e68dde17de286ea0b666eb4a3933e8739f9dc931ad148beb4ca5c488932d918b7633b70
2013-01-18 10:37:25 -05:00
David Gillingham
8664cd3ab3
Issue #1486 : Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
...
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc
Former-commit-id: de3e72065e9e3999a427c6e64d83a2de3e72065e9e3999a427c6e64d83a2d16760c73ec6e64d83a2d16760c73ec8ec47e58f09836daccaa40383de3b74bd042c3f9266b39ced
2013-01-17 17:42:05 -06:00
