Roger Ferrel
590ef32dcb
Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
...
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: 0982485efe70bd9aafa74deb731bd00982485efe70bd9aafa74deb731bd0b421c97d864deb731bd0b421c97d867c6bd5aeb00deb290c24334f2c4a570bbe51355e241dfb9451
2013-03-11 13:00:44 -05:00
Nate Jensen
c3eee1d672
Issue #1773 log publish times
...
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 8a5ebbb9c95d9778a8d65e3d6df7e08a5ebbb9c95d9778a8d65e3d6df7e05c59a61cef5e3d6df7e05c59a61cef5f343a50ae21863c5db5d7902aba68a2f804350ad0bed867b0
2013-03-07 16:49:40 -06:00
David Gillingham
4310a7cf4c
Issue #1447 : Implement active table fetching, make bug fixes
...
to active table sharing from testing.
Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d
Former-commit-id: c30aefd88975e82d9fca95f8074c97c30aefd88975e82d9fca95f8074c970a79d08dd895f8074c970a79d08dd8266c316c9c94bccc87a35ad72e2a7f2ca8e5e42aa1029acb7c
2013-03-06 14:23:00 -06:00
Dustin Johnson
a0635b7972
Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
...
Former-commit-id: cfae194f9b21abece1f2d4c6c29f5fcfae194f9b21abece1f2d4c6c29f5f3eddb2d286d4c6c29f5f3eddb2d286513f990a00b88a1eefc1bfed4555a2f6431b52bfd28ff6d3c2
2013-03-05 13:32:04 -06:00
Steve Harris
2104c8b533
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 3ec20c168961a19a460b305dd729693ec20c168961a19a460b305dd7296957f42761d7305dd7296957f42761d77ff64bf8ccb423579e4aa8e1557c62b630339eb7d842ed88a7
2013-03-05 12:27:49 -06:00
Mike Duff
f82462f4a0
Issue #1752 - Lock down user admin dialog
...
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb
Former-commit-id: ec9f3ea4a19d99eea6176809cb6f80ec9f3ea4a19d99eea6176809cb6f80193cf1e54f6809cb6f80193cf1e54fe71d15f640af84910ac6775a0e3edd78953a3fd7ffbc3e4b9f
2013-03-05 11:26:54 -06:00
Steve Harris
f20c87110e
13.3.1-5 baseline
...
Former-commit-id: e4a1c61ad58123d5ac45a89221c75be4a1c61ad58123d5ac45a89221c75be26f7eb151a89221c75be26f7eb151aabd5cd51fa240379588a40c9136fe1f98e01c5779ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc
13.3.1-4 baseline
...
Former-commit-id: 9066d511fed79303de138c0b90f2929066d511fed79303de138c0b90f2922edca909028c0b90f2922edca909024bfbb518c03e0614b43a5e55ded3a90df35cc5ec153aadc1d7
2013-03-05 10:39:59 -06:00
Richard Peter
3ab85aa0f3
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: 3cc3648b9be74f6074e7070f62d08e3cc3648b9be74f6074e7070f62d08e784cd2145f070f62d08e784cd2145fc7a4dcede6a4bf42628a180540eb476b08735982fa19a76a42
2013-03-04 17:48:05 -06:00
Dave Hladky
69e1b5f133
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: d0cfd0920922ebfe0ecb680317d9c4d0cfd0920922ebfe0ecb680317d9c4fc36146f48680317d9c4fc36146f48f47935a03c0f3c9ba9971260b40307fc90d47619ac69f97305
2013-03-04 17:41:11 -06:00
Steve Harris
7a487645a9
Issue #1744 - Revert "Issue #1744 fix deadlock"
...
This reverts commit 9654c8090646ceab84c1c99047740291d577f4dbc5600acf79f7ffa22c7cf4cccabc07394a96db44e2f12d16b72a575a24e7394a96db44e2f12d16b72a575a24e7f4cccabc072a575a24e7f14f5aeb487ffb42d6e628391884a7f14f5aeb487ffb42d6e628391884a7fcb48a728028391884a7fcb48a72808d3a082908f70ff93d2c9e87721b855baddd467804d09aba00
2013-03-04 13:03:19 -06:00
Steve Harris
749d6a1b89
Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
...
This reverts commit 62e364213a312e2e07aeeec5f87ab249fc025594348f5f0f4133da766f6335007e0460eefa0d8e873dc69632c18c84bc5fbbeefa0d8e873dc69632c18c84bc5fbb35007e04608c84bc5fbb702cec08bd870972fb9088e633934d702cec08bd870972fb9088e633934dbba410a33088e633934dbba410a3309eeda5c82eee2452f5d37d2286aea7f92b1e3534b71436dba8
2013-03-04 13:02:32 -06:00
Nate Jensen
ccc125751d
Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
...
Former-commit-id: 64d504df916bf2eefa2aa90a2fe85764d504df916bf2eefa2aa90a2fe857677908868ea90a2fe857677908868ece0fb925d075366a9e5a216e3d6ad3e7d6ad103638e747194a
2013-03-01 13:43:50 -06:00
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
Ben Steffensmeier
b487a896ae
Issue #1731 Optimize construction of scan resource.
...
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: f505cda0bfb0870c55f686b9a4d8c2f505cda0bfb0870c55f686b9a4d8c29263ff184686b9a4d8c29263ff18469eb0c3e7788f4c2f2a395a149c5dfa77aef5f955c28a151884
2013-03-01 11:03:11 -06:00
Nate Jensen
62e364213a
Issue #1744 actually fix deadlock this time
...
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb
Former-commit-id: eefa0d8e873dc69632c18c84bc5fbbeefa0d8e873dc69632c18c84bc5fbb35007e04608c84bc5fbb35007e046049fc025594348f5f0f4133da766f63eec5f87ab2312e2e07ae
2013-03-01 10:48:03 -06:00
Nate Jensen
9654c80906
Issue #1744 fix deadlock
...
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f
Former-commit-id: 394a96db44e2f12d16b72a575a24e7394a96db44e2f12d16b72a575a24e7f4cccabc072a575a24e7f4cccabc0791d577f4dbc5600acf79f7ffa22c7cc99047740246ceab84c1
2013-03-01 10:12:56 -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
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
3e4c9990c0
Merge "Issue #1642 : Fix QPID Deadlock scenario - Address peer review comments" into development
...
Former-commit-id: 0cd78444b8a020438c9958957d30e50cd78444b8a020438c9958957d30e524c94ef55b58957d30e524c94ef55bec7eecbb4f652ac25d12b6fc51a18c841ddd85090ac9146923
2013-02-26 18:00:50 -06:00
Richard Peter
787b2e3afd
Issue #1642 : Fix QPID Deadlock scenario
...
- Address peer review comments
Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462
Former-commit-id: 3e5ab03ecf7d4206420c9a0177861f3e5ab03ecf7d4206420c9a0177861f5b2650599d9a0177861f5b2650599d0b51936566ea806139d34deaf372a1e964d248fe294914b403
2013-02-26 16:01:25 -06:00
Dustin Johnson
b24c3f23c7
Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
...
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7
Former-commit-id: 1d9690f2998038b840d87852f883521d9690f2998038b840d87852f8835288a9b953b67852f8835288a9b953b6c23b8a58c394300e0c1dcc0254ba032d6df74b676bb570ce5c
2013-02-26 15:06:04 -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
Mike Duff
d1fec7bb15
Issue #1552 - Implement FFMP Data Access
...
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 018953526b8a8e8f7a738bddd467b1018953526b8a8e8f7a738bddd467b181649d346a8bddd467b181649d346a5439b30b6a01ef273417b1a549a99fa92492ed07383f5c075e
2013-02-25 09:29:16 -06:00
Steve Harris
02f04a926e
13.3.1-3 baseline
...
Former-commit-id: 4a0eea00b5a55f438dd865724528874a0eea00b5a55f438dd865724528878a64f142e565724528878a64f142e530efc4c86a05eb25f1248d741715e31ba778753f9da8db0212
2013-02-25 10:24:53 -05:00
Steve Harris
dbaeb28c82
13.3.1-2 baseline
...
Former-commit-id: 0b3acc01303e60b23072df6d6f598e0b3acc01303e60b23072df6d6f598e3d115ed3bedf6d6f598e3d115ed3bef2428e968a370ed98038e8a51dc7802a2a9e03b7a43233f8c2
2013-02-25 10:18:36 -05:00
Dustin Johnson
3b3b786990
Issue #1543 Make DAOs public
...
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a
Former-commit-id: 5a4dd6fbd1d4186178af06b76975535a4dd6fbd1d4186178af06b7697553074378277206b76975530743782772637c7e62c2a1df296e804e87912a9c0d9f1215482e513ab5ac
2013-02-22 12:22:43 -06: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
Nate Jensen
9a8f71c7a8
Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
...
Former-commit-id: ec0dd8d234b2f7cbcbe37dbeeb2684ec0dd8d234b2f7cbcbe37dbeeb2684c6896b56767dbeeb2684c6896b5676b423cd4d70533deac8d04f4932b0140f92e92c18d4268d6086
2013-02-21 11:47:00 -06:00
Nate Jensen
a29dcc879f
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
...
Former-commit-id: a8e81097fc033b9e3852a9c4e54287a8e81097fc033b9e3852a9c4e5428773f53bd513a9c4e5428773f53bd513e19664ab186f9d3f55e5d7a57d2b34767596401f98e5133a1c
2013-02-21 11:41:52 -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
2a9f20fca7
Merge "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." into development
...
Former-commit-id: 8256f182c2b6602f9468a9e976eed88256f182c2b6602f9468a9e976eed8cb1380af90a9e976eed8cb1380af9018cfc1ee4df552967bf35031ae4d66d62153b1b4a5a2f437f9
2013-02-20 16:17:20 -06:00
Dave Hladky
94b8025274
Issue #1635 Second Guidance source verification, general cleanup
...
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526
Former-commit-id: fdfbf59dbae7993c968d7b36b055f1fdfbf59dbae7993c968d7b36b055f141f2ea7efe7b36b055f141f2ea7efef439b63316261d00c544b1c8f153e0cd7493835587cfb35394
2013-02-20 16:13:08 -06:00
Ben Steffensmeier
7a930f49eb
Issue #1628 clean up Inflaters used by HttpClient.
...
Former-commit-id: 8cb150a0e90e9226b5f5ef2dd2a0318cb150a0e90e9226b5f5ef2dd2a031e2efad85feef2dd2a031e2efad85fe9d34dce3de0f1057cb3d2debab14f5cc0dcc8eae63cf7e3cb9
2013-02-20 12:58:13 -06:00
Roger Ferrel
0ab8a42f96
Issue #1636 Changes to TimeTools to allow file timestamp pattern to allow option hour; and WarningDecoder.py now uses TimeTools.
...
Change-Id: Iac6a4453c06d571f9462db9074b81434e1b5f45f
Former-commit-id: c0df401088acfccac9718baa3b6df5c0df401088acfccac9718baa3b6df5dd05bc65be8baa3b6df5dd05bc65be672a979183e47c91eda78264adc47d70dae3453acdbebf0743
2013-02-20 12:09:26 -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
Ben Steffensmeier
d114d01dff
Issue #1598 fix GridParamInfo keys.
...
Former-commit-id: 4370018cbf7d4b065a231ab9f7bd1f4370018cbf7d4b065a231ab9f7bd1fc1b8ceecf11ab9f7bd1fc1b8ceecf19c889bcc37cde7275a2a48e6ffe392c6c33c4b932deb16071d
2013-02-19 14:06:26 -06:00
Steve Harris
b7446ac966
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: f1f5359a2fc2327ce33dea50a5db77f1f5359a2fc2327ce33dea50a5db77d123c044c3ea50a5db77d123c044c3bca88ba9c781f1fb83a01c08acab385a33182da577a66598fe
2013-02-19 12:22:00 -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
62c839b9d3
Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development
...
Former-commit-id: 9b9579d25283d12549bf77157e3c6c9b9579d25283d12549bf77157e3c6cf364af584d77157e3c6cf364af584d24f36419b3d42a0b9f0d623020926e3b1a6d4c3033aa90c3de
2013-02-18 15:36:41 -06:00
Dustin Johnson
5b3735a110
Issue #1543 Use XML to represent retrieval
...
- Only include request identifier for serialized retrieval data
- RetrievalAttributes are now retrieved from the database
- Remove plugin data objects from class names
- Add retrievalDao to retrieval task constructor
Amend:
Add call-through method to prepare for serialization.
Change-Id: Ic5d2243dd77e1aefd49057a0b7843329e95f0c9d
Former-commit-id: dc3b521846f16c1507d0437a168b50dc3b521846f16c1507d0437a168b5062a84aea76437a168b5062a84aea763110a88e0c6f94c035e8db3a9d8f19f6257b20ea191ec3b408
2013-02-18 13:05:41 -06:00
Ben Steffensmeier
5bff6447ad
Issue #1598 Make GridParamInfoLookup filter on extension.
...
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744
Former-commit-id: 46d8c78abdefc1335b1f63a725718d46d8c78abdefc1335b1f63a725718dd2e17d147363a725718dd2e17d1473f94530360347090eccc15ada0b2c2ad472a5d48ebc3be10852
2013-02-18 10:36:47 -06:00
