744 commits

Author	SHA1	Message	Date
Max Schenkelberg	fc58e7431a	Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance ... Change-Id: I3f336969a48764785ac148c9d67799e228e66d62 Former-commit-id: 1769edc026 [formerly ec40d261e5] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]] Former-commit-id: 547c593dec Former-commit-id: 13a4056335	2013-02-27 16:19:58 -06:00
Max Schenkelberg	41706c42f2	Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database. ... Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79 Former-commit-id: c8a5f1a007 [formerly 0f1112fb3e] [formerly 38bba3705f [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]] Former-commit-id: 38bba3705f Former-commit-id: 6ebc058df4	2013-02-27 12:26:32 -06:00
Max Schenkelberg	5617dfaa67	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: 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]] Former-commit-id: e0ba97d547 Former-commit-id: 6b1426dd34	2013-02-27 11:50:38 -06:00
Ron Anderson	541557e0b0	Issue #1597 Code cleanup and logging improvement for GFE Performance metrics ... Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765 Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]] Former-commit-id: f37999b1eb Former-commit-id: 77fbbb6a61	2013-02-26 18:44:51 -06:00
Nate Jensen	652ac25d12	Merge "Issue #1642: Fix QPID Deadlock scenario - Address peer review comments" into development ... Former-commit-id: a020438c99 [formerly 58957d30e5] [formerly 24c94ef55b [formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]] Former-commit-id: 24c94ef55b Former-commit-id: b6fc51a18c	2013-02-26 18:00:50 -06:00
Richard Peter	ea806139d3	Issue #1642: Fix QPID Deadlock scenario ... - Address peer review comments Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462 Former-commit-id: 7d4206420c [formerly 9a0177861f] [formerly 5b2650599d [formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]] Former-commit-id: 5b2650599d Former-commit-id: 4deaf372a1	2013-02-26 16:01:25 -06:00
Dustin Johnson	94300e0c1d	Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file. ... Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7 Former-commit-id: 8038b840d8 [formerly 7852f88352] [formerly 88a9b953b6 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]] Former-commit-id: 88a9b953b6 Former-commit-id: cc0254ba03	2013-02-26 15:06:04 -06:00
Nate Jensen	b173d34ba9	Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development ... Former-commit-id: 15c4c4dfa0 [formerly b062299796] [formerly 36d4eff2c6 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]] Former-commit-id: 36d4eff2c6 Former-commit-id: 5c33098315	2013-02-26 13:53:40 -06:00
Matt Nash	32096feba8	Issue #1668 add gsd pattern to allow for their plugins to be deployed ... Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6 Former-commit-id: 41bbd4cf2d [formerly a2fb0db684] [formerly 051b36ad73 [formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]] Former-commit-id: 051b36ad73 Former-commit-id: b1fe380c44	2013-02-26 13:29:04 -06:00
Dustin Johnson	219e882fc5	Issue #1643 Add NCF bandwidth manager router ... Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8 Former-commit-id: ebf02481f0 [formerly d58d28c636] [formerly 722e41b8b0 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]] Former-commit-id: 722e41b8b0 Former-commit-id: cf86c92fad	2013-02-26 11:32:03 -06:00
Steve Harris	901cbbf56d	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: cd99e680bb [formerly b50e384a0f] [formerly e8135b9c14 [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]] Former-commit-id: e8135b9c14 Former-commit-id: 2398ef1e85	2013-02-25 16:05:22 -06:00
Steve Harris	e46625f8f2	Merge branch 'development' into omaha_13.3.1 ... Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]] Former-commit-id: 6ec9e73035 Former-commit-id: 0051276ad1	2013-02-25 15:58:48 -06:00
Bryan Kowal	f8c920c6cd	Issue #1634 - fix EDEX debug with YAJSW Wrapper ... Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96 Former-commit-id: 4d160993fb [formerly b05073fbe3] [formerly 0d2262c0bf [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]] Former-commit-id: 0d2262c0bf Former-commit-id: 36a887416f	2013-02-25 11:30:13 -06:00
Mike Duff	01ef273417	Issue #1552 - Implement FFMP Data Access ... Peer review comments Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55 Former-commit-id: 8a8e8f7a73 [formerly 8bddd467b1] [formerly 81649d346a [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]] Former-commit-id: 81649d346a Former-commit-id: b1a549a99f	2013-02-25 09:29:16 -06:00
Steve Harris	05eb25f124	13.3.1-3 baseline ... Former-commit-id: a55f438dd8 [formerly 6572452887] [formerly 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]] Former-commit-id: 8a64f142e5 Former-commit-id: 8d741715e3	2013-02-25 10:24:53 -05:00
Steve Harris	370ed98038	13.3.1-2 baseline ... Former-commit-id: 3e60b23072 [formerly df6d6f598e] [formerly 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]] Former-commit-id: 3d115ed3be Former-commit-id: e8a51dc780	2013-02-25 10:18:36 -05:00
Dustin Johnson	a1df296e80	Issue #1543 Make DAOs public ... Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a Former-commit-id: d4186178af [formerly 06b7697553] [formerly 0743782772 [formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]] Former-commit-id: 0743782772 Former-commit-id: 4e87912a9c	2013-02-22 12:22:43 -06:00
Bryan Kowal	53b9e69868	Issue #1634 - force added wrapper jars in bin directory ... Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48 Former-commit-id: 4cd5453e0a [formerly 7c62991edf] [formerly d5c8b82941 [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]] Former-commit-id: d5c8b82941 Former-commit-id: 5a5914c010	2013-02-22 09:28:37 -06:00
Steve Harris	4f155a183a	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: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]] Former-commit-id: 2641d578e2 Former-commit-id: 33dd2589f1	2013-02-21 15:41:39 -06:00
Bryan Kowal	b2a0a7c148	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: 519ce2c0fb [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]] Former-commit-id: 803397c7c7 Former-commit-id: 450e8e7a4c	2013-02-21 13:55:28 -06:00
Nate Jensen	533deac8d0	Merge "Issue #1628 clean up Inflaters used by HttpClient." into development ... Former-commit-id: b2f7cbcbe3 [formerly 7dbeeb2684] [formerly c6896b5676 [formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]] Former-commit-id: c6896b5676 Former-commit-id: 4f4932b014	2013-02-21 11:47:00 -06:00
Nate Jensen	6f9d3f55e5	Merge "Issue #1635 Second Guidance source verification, general cleanup" into development ... Former-commit-id: 033b9e3852 [formerly a9c4e54287] [formerly 73f53bd513 [formerly 25ecfc3e6199294275abc8547c482388c55be724]] Former-commit-id: 73f53bd513 Former-commit-id: d7a57d2b34	2013-02-21 11:41:52 -06:00
Steve Harris	0569ff413d	13.3.1-1 baseline ... Former-commit-id: 96768407a5 [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]] Former-commit-id: cabc8cf8b4 Former-commit-id: 92e4c7ba19	2013-02-21 09:36:59 -05:00
Steve Harris	e4435815c9	13.3.1-1 baseline ... Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]] Former-commit-id: d2a654625f Former-commit-id: 46d28be4a4	2013-02-20 16:19:40 -06:00
Dustin Johnson	f552967bf3	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: b6602f9468 [formerly a9e976eed8] [formerly cb1380af90 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]] Former-commit-id: cb1380af90 Former-commit-id: 5031ae4d66	2013-02-20 16:17:20 -06:00
Dave Hladky	261d00c544	Issue #1635 Second Guidance source verification, general cleanup ... Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526 Former-commit-id: e7993c968d [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]] Former-commit-id: 41f2ea7efe Former-commit-id: b1c8f153e0	2013-02-20 16:13:08 -06:00
Ben Steffensmeier	0f1057cb3d	Issue #1628 clean up Inflaters used by HttpClient. ... Former-commit-id: 0e9226b5f5 [formerly ef2dd2a031] [formerly e2efad85fe [formerly 765b3b00362cbe9a5d6c3e392e005b42d968d268]] Former-commit-id: e2efad85fe Former-commit-id: 2debab14f5	2013-02-20 12:58:13 -06:00
Roger Ferrel	e47c91eda7	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: acfccac971 [formerly 8baa3b6df5] [formerly dd05bc65be [formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]] Former-commit-id: dd05bc65be Former-commit-id: 8264adc47d	2013-02-20 12:09:26 -06:00
Dustin Johnson	5a8b6459d4	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: d4afef2cab [formerly d8659e742e] [formerly c8760e5699 [formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]] Former-commit-id: c8760e5699 Former-commit-id: ca721863be	2013-02-20 10:42:51 -06:00
Ben Steffensmeier	cde7275a2a	Issue #1598 fix GridParamInfo keys. ... Former-commit-id: 7d4b065a23 [formerly 1ab9f7bd1f] [formerly c1b8ceecf1 [formerly 33da1c48a76b468b9fee4e05de835295c7393672]] Former-commit-id: c1b8ceecf1 Former-commit-id: 48e6ffe392	2013-02-19 14:06:26 -06:00
Steve Harris	81f1fb83a0	Merge branch 'omaha_13.2.1' (13.2.1-8) into development ... Former-commit-id: c2327ce33d [formerly ea50a5db77] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]] Former-commit-id: d123c044c3 Former-commit-id: 1c08acab38	2013-02-19 12:22:00 -06:00
Dustin Johnson	5ff6387368	Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes ... Amend: Use ref syntax with uri. Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062 Former-commit-id: 2a588688b1 [formerly cc598094fa] [formerly 116809346b [formerly 66fe560026848357ae165a675be9818da719675d]] Former-commit-id: 116809346b Former-commit-id: 3585482cad	2013-02-18 15:47:17 -06:00
Richard Peter	d42a0b9f0d	Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development ... Former-commit-id: 83d12549bf [formerly 77157e3c6c] [formerly f364af584d [formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]] Former-commit-id: f364af584d Former-commit-id: 623020926e	2013-02-18 15:36:41 -06:00
Dustin Johnson	6f94c035e8	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: f16c1507d0 [formerly 437a168b50] [formerly 62a84aea76 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]] Former-commit-id: 62a84aea76 Former-commit-id: db3a9d8f19	2013-02-18 13:05:41 -06:00
Ben Steffensmeier	47090eccc1	Issue #1598 Make GridParamInfoLookup filter on extension. ... Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744 Former-commit-id: efc1335b1f [formerly 63a725718d] [formerly d2e17d1473 [formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]] Former-commit-id: d2e17d1473 Former-commit-id: 5ada0b2c2a	2013-02-18 10:36:47 -06:00
Richard Peter	4f3d9ab931	Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development ... Former-commit-id: 3c126b0ab1 [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly a07a434ad71986aa4b474dd88e266035e347efa4]] Former-commit-id: 4fb1cb27dc Former-commit-id: 8991c1c86d	2013-02-18 09:35:53 -06:00
Steve Harris	8cffb55371	13.2.1-8 baseline ... Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]] Former-commit-id: 053156f02e Former-commit-id: c6d584758f	2013-02-18 09:09:41 -06:00
Nate Jensen	d39e16e532	Merge "Issue #1614 Cache LatLonReprojection results. Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338" into development ... Former-commit-id: eb8e87dfe2 [formerly 88b665c09a] [formerly 52a0673961 [formerly cb57fe31471693b2f3398d0c6bd97af36410d9b8]] Former-commit-id: 52a0673961 Former-commit-id: d648e77fa5	2013-02-18 09:07:18 -06:00
Steve Harris	58bafc0068	13.2.1-8 baseline ... Former-commit-id: da707ff25c [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]] Former-commit-id: 535a9402a7 Former-commit-id: a68ce64f45	2013-02-18 09:23:06 -05:00
Mike Duff	3e59308771	Issue #1584 - FFMP performance stats and performance logger ... Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c Former-commit-id: 897262630c [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]] Former-commit-id: 9c1e0ab639 Former-commit-id: 079ec4b6dd	2013-02-18 08:16:57 -06:00
Richard Peter	774ea0ede6	Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development ... Former-commit-id: b3e2ca7b30 [formerly a40ae4d8b2] [formerly a6fa92923f [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]] Former-commit-id: a6fa92923f Former-commit-id: 5936f671ce	2013-02-15 16:33:00 -06:00
Ben Steffensmeier	5b1acfdeb3	Issue #1614 Cache LatLonReprojection results. ... Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338 Former-commit-id: a10e7edaeb [formerly e53416937e] [formerly feb2e98e58 [formerly 2596b3105e377f0fb8713be502a41b4b2f470e93]] Former-commit-id: feb2e98e58 Former-commit-id: 6b53511f9e	2013-02-15 14:24:22 -06:00
Brad Gonzales	1501ed6deb	Issue #1615 Changed radar header names to match other header names. ... Change-Id: I6b3be3028a1602ead03ec209e773db68bbfb665a Former-commit-id: 1ddcd8b3a8 [formerly a9012633a1] [formerly 961f51e91f [formerly b7f5d565bdfb8f1289f73837ffa9a54f2659d65c]] Former-commit-id: 961f51e91f Former-commit-id: 0dda5f784e	2013-02-15 14:02:03 -06:00
Nate Jensen	d6ba283efc	Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development ... Former-commit-id: 1b1e468e1f [formerly f748815e22] [formerly f79f7db348 [formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]] Former-commit-id: f79f7db348 Former-commit-id: a60cf277bc	2013-02-15 11:56:11 -06:00
Ben Steffensmeier	91bbdc3337	Issue #1614 Refactor data access framework to use single request. ... Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798 Former-commit-id: e771076275 [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]] Former-commit-id: 0933a5f596 Former-commit-id: f0f3c71d50	2013-02-15 11:39:56 -06:00
Ron Anderson	d69d628450	Issue #1608 Fixed group deletes in H5pyDataStore.py ... Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a Former-commit-id: dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]] Former-commit-id: 7c0a5d74bf Former-commit-id: e952a4f179	2013-02-15 09:03:41 -06:00
Richard Peter	ad4110a73f	Merge "Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging." into development ... Former-commit-id: dcd4761b54 [formerly eb00310ef9] [formerly b54ec2b59e [formerly b3c7458333b9a8d0f011614c0b4845397e074ce8]] Former-commit-id: b54ec2b59e Former-commit-id: 0bab06709b	2013-02-15 08:44:02 -06:00
Richard Peter	015b51082d	Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development ... Former-commit-id: bd91d2b8be [formerly 5a5a5ba855] [formerly d905313941 [formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]] Former-commit-id: d905313941 Former-commit-id: 2d8327e76f	2013-02-15 08:31:33 -06:00
Dustin Johnson	d0ecd69456	Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed ... Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41 Former-commit-id: 4be6c12ac6 [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]] Former-commit-id: 6e2f69939f Former-commit-id: 1ef440f8ee	2013-02-15 08:13:11 -06:00
Brad Gonzales	936facbe86	Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType. ... Amend: Corrected comment in convertPluginNameToDataType.sh Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18 Former-commit-id: 6a0e9c331b [formerly 03dd42463e] [formerly dfef89ee64 [formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]] Former-commit-id: dfef89ee64 Former-commit-id: e495a5f663	2013-02-14 17:34:55 -06:00