Nate Jensen
b4aea0385c
Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
...
Former-commit-id: 5526ee7e8d
[formerly 1144f08e59
] [formerly a3e0bf09ab
[formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]
Former-commit-id: a3e0bf09ab
Former-commit-id: 3f5b8b56ef
2013-02-14 15:05:14 -06:00
Dave Hladky
a17dee033a
Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
...
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950
Former-commit-id: 2655952304
[formerly 7b3a310f67
] [formerly 381aec5976
[formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]
Former-commit-id: 381aec5976
Former-commit-id: 5c66cbcd27
2013-02-14 13:58:32 -06:00
Ben Steffensmeier
efaddb710c
Issue #1614 allow locationNames for grid data access
...
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2
Former-commit-id: ef7addb005
[formerly ab319bd3a8
] [formerly 9b4de367e3
[formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]
Former-commit-id: 9b4de367e3
Former-commit-id: 0995024482
2013-02-14 10:07:01 -06:00
Dustin Johnson
6f821ed8c9
Issue #1543 Serialize DODS response rather than plugin data objects directly
...
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.
Amend:
Peer review comments.
Set retrieval status to failed when payload is null.
Change-Id: I458b13856302c8faceeef985c1c41115644520b7
Former-commit-id: 25faaa2af0
[formerly dd8ca33fc4
] [formerly d143735ea8
[formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]
Former-commit-id: d143735ea8
Former-commit-id: 9783dc4d9f
2013-02-14 09:49:22 -06:00
Richard Peter
ba2c69fb17
Merge "Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method." into development
...
Former-commit-id: edcf52d9c1
[formerly e92c1fe346
] [formerly 671f961a99
[formerly 6574bb0978629fd9fac45b2f7eee1dc7a42d5156]]
Former-commit-id: 671f961a99
Former-commit-id: 351d52b311
2013-02-13 10:24:50 -06:00
Richard Peter
0804763d1a
Merge "Issue #1526 refactor for clarity and to stream responses from pypies" into development
...
Former-commit-id: 7438d87e58
[formerly e611aab017
] [formerly dbcb8bd30e
[formerly a8d1d7259bf914fac127361bde67d6513f775e8f]]
Former-commit-id: dbcb8bd30e
Former-commit-id: 6ec1990bd9
2013-02-13 10:18:24 -06:00
Nate Jensen
54cea219cf
Issue #1526 refactor for clarity and to stream responses from pypies
...
Change-Id: Ia07aca01a528b51de4fd20571edaa90cc06631d7
Former-commit-id: 56112143c3
[formerly 96232ab0ab
] [formerly 92076242fc
[formerly 26ba8a930a723ccbecdc09d873cbcb917e8b453e]]
Former-commit-id: 92076242fc
Former-commit-id: cbca34e709
2013-02-12 16:33:01 -06:00
Brad Gonzales
666c728476
Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method.
...
Change-Id: Ib3eaf4c319d844c277dd7288d565bb9508fa46f8
Former-commit-id: 465764854a
[formerly 9917cb9f46
] [formerly 26f2374d54
[formerly 6eff40bb823594da5346022eeffc15910cdfb799]]
Former-commit-id: 26f2374d54
Former-commit-id: ec6bfc0d5e
2013-02-12 13:49:18 -06:00
Matt Nash
e97b31bb7e
Issue #1570 add ability for synchronous operations in PythonJobCoordinator
...
Change-Id: Ida7d53c8675dee57ef37e3544500b8306ecb54c4
Former-commit-id: 3b2fa3eafe
[formerly ba3a70d02c
] [formerly 85988ecfe6
[formerly f3f4604a64c797b998ffa7d4ccc574a0cc1dd633]]
Former-commit-id: 85988ecfe6
Former-commit-id: c0ce67463f
2013-02-12 13:39:44 -06:00
Nate Jensen
9fb05f0a96
Merge "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." into development
...
Former-commit-id: 2c516156f1
[formerly 207cca1edf
] [formerly 4452a5d62f
[formerly ec5a6b3d1ad551db73f3cd60eafe2b97267a6bdd]]
Former-commit-id: 4452a5d62f
Former-commit-id: 4e0e1fe65e
2013-02-12 12:15:37 -06:00
Matt Nash
39f3f70e1b
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: 2bed543d32
[formerly 1c504de33e
] [formerly da21cf82e9
[formerly 4b56329756881b3291ad2856a5c166cdfc635bf9]]
Former-commit-id: da21cf82e9
Former-commit-id: d39f0938e8
2013-02-12 12:02:48 -06:00
Dustin Johnson
4a10957512
Issue #1543 Clean up test files after changing to Spring transactions
...
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680
Former-commit-id: 651c6d55c1
[formerly 4bcd75c091
] [formerly 19fd95d2c8
[formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]]
Former-commit-id: 19fd95d2c8
Former-commit-id: b4367903b0
2013-02-12 11:59:45 -06:00
Dustin Johnson
e8f382e7c0
Merge "Issue #1554 fix XmlGenericMapAdapter to work with null maps." into development
...
Former-commit-id: ab7e404ffa
[formerly 9004e0f57c
] [formerly 5c1c1ec582
[formerly 2d2dd4cc62a45794a3a912eb75c9d2745815dc4e]]
Former-commit-id: 5c1c1ec582
Former-commit-id: 12b6ac3d56
2013-02-12 07:59:24 -06:00
Dustin Johnson
ecbd1896dc
Merge "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." into development
...
Former-commit-id: bc8fb2f4ea
[formerly 2457359c0f
] [formerly 6a4a11536e
[formerly 4d055580ddea29eb35983dbe4e9e01a611f23ba1]]
Former-commit-id: 6a4a11536e
Former-commit-id: da9072b0f1
2013-02-12 07:58:39 -06:00
Ron Anderson
1ec0410989
Merge "Issue #1554 initial implementation of GFE grid factory. Change-Id: Id2ae308c0c13822dd6e5dd0195f7920df82ff994" into development
...
Former-commit-id: dfe0723e65
[formerly 5bee722544
] [formerly 9713b42306
[formerly 7c4d695201e473de349f4f5a83a1a5283d6cb4f4]]
Former-commit-id: 9713b42306
Former-commit-id: 184cd6d508
2013-02-11 17:20:21 -06:00
Ron Anderson
c862db5513
Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging.
...
Change-Id: I820a780dcbaa3e6ffefd56737bac7dbc13c2e485
Former-commit-id: 95d18f9283
[formerly 771296a845
] [formerly b6a9b42094
[formerly 39282e6528aeb01a40a01df477f4579afab79ca3]]
Former-commit-id: b6a9b42094
Former-commit-id: 12b0fbdab8
2013-02-11 17:16:48 -06:00
Ben Steffensmeier
ae0ac4e21c
Issue #1554 fix XmlGenericMapAdapter to work with null maps.
...
Former-commit-id: 4a7d94ecbd
[formerly 60c435861a
] [formerly 7220c4c6cc
[formerly 904e3387de59f534b6457c7a12e8f94d55974884]]
Former-commit-id: 7220c4c6cc
Former-commit-id: 21616e06ce
2013-02-11 16:08:58 -06:00
Ben Steffensmeier
92eb21f91c
Issue #1554 initial implementation of GFE grid factory.
...
Change-Id: Id2ae308c0c13822dd6e5dd0195f7920df82ff994
Former-commit-id: b5fa5d45fb
[formerly f34751122a
] [formerly ff13255ebe
[formerly 0b350f62b26c9f2154a1d7bd6ba9d18475012495]]
Former-commit-id: ff13255ebe
Former-commit-id: 1663a758b8
2013-02-11 15:20:40 -06:00
Dustin Johnson
73a5667256
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: 0d548bd66f
[formerly 8307af022c
] [formerly ef32853dc1
[formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]
Former-commit-id: ef32853dc1
Former-commit-id: e504a474f9
2013-02-11 14:21:57 -06:00
Lee Venable
e978f5cf5a
Merge "Issue #1580 - Implementation of Stats/Event framework." into development
...
Former-commit-id: 3fabb894fc
[formerly 0f3bfe7fc1
] [formerly 48bcf5dece
[formerly f554b7144ffc8ff48f463a7d6ccf07edda1860d2]]
Former-commit-id: 48bcf5dece
Former-commit-id: 73c8533cbb
2013-02-11 12:00:22 -06:00
Nate Jensen
55287447c9
Merge "Issue #1553 minor fixes to radar grid access." into development
...
Former-commit-id: f938432a6f
[formerly 8a141029ff
] [formerly f0be76e8ee
[formerly f113911f360b69d9a831b1fe7aed8ba29806316d]]
Former-commit-id: f0be76e8ee
Former-commit-id: bf0fc5ac32
2013-02-11 09:53:51 -06:00
Nate Jensen
cefa4c3901
Merge "Issue #1590 Change localization notification observer to send notification to listeners after unlocking file to avoid deadlock" into development
...
Former-commit-id: 139fbac574
[formerly ef0194872a
] [formerly 1cf73c4426
[formerly 6eefd1de088b4b3e334a3c587c371a4028ee09dd]]
Former-commit-id: 1cf73c4426
Former-commit-id: 69ebf80213
2013-02-11 09:48:42 -06:00
Steve Harris
2d08f63ded
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 76b7586da8
[formerly 89581b175b
] [formerly ffc1f4c75c
[formerly bc1132a73a78b9f8c1f92f6ded82335f77ebadf8]]
Former-commit-id: ffc1f4c75c
Former-commit-id: 861983a573
2013-02-08 16:14:17 -06:00
Steve Harris
9f3148073c
Merge branch 'ss_builds' (13.2.1-6) into 13.2.1_delivery
...
Former-commit-id: 11fe18edec
[formerly 51449a651e
] [formerly 7b788f8e48
[formerly bdcffbb263cafbe7ee626b82dfa808a2e2ea58af]]
Former-commit-id: 7b788f8e48
Former-commit-id: a45d9231d6
2013-02-08 16:13:38 -06:00
Steve Harris
dd5d3741b0
13.2.1-6 baseline
...
Former-commit-id: d6b32d9d1f
[formerly 89a698bc02
] [formerly bd02b0b1b4
[formerly c5df294c580862d0ac52b44bc473d4512f77cf2e]]
Former-commit-id: bd02b0b1b4
Former-commit-id: efe8c4eae4
2013-02-08 15:59:40 -06:00
Ben Steffensmeier
04c0603ed5
Issue #1553 minor fixes to radar grid access.
...
Former-commit-id: 5f40a89ce3
[formerly 701c135510
] [formerly a55a53ed66
[formerly 0d5997a70653c9a327501a868b5a243d40fb66fb]]
Former-commit-id: a55a53ed66
Former-commit-id: 38164f3eb9
2013-02-08 12:46:47 -06:00
Mike Duff
317b174c24
Issue #1580 - Implementation of Stats/Event framework.
...
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd
Former-commit-id: 804f526206
[formerly def0464898
] [formerly b9f317bbd0
[formerly ca2f288876b80fe5e491f335fb6b22b20a468fca]]
Former-commit-id: b9f317bbd0
Former-commit-id: 15f96b75a5
2013-02-08 10:23:45 -06:00
Max Schenkelberg
9235c32f9e
Issue #1590 Change localization notification observer to send notification to listeners after unlocking file to avoid deadlock
...
Change-Id: I2b5ffa08af98259bdd860feb4cd989be013a05be
Former-commit-id: 4ba75b9ece
[formerly 232400965d
] [formerly 3f3359370d
[formerly 1ebb6aa360c9f916f09a5da95e5d831a021508e1]]
Former-commit-id: 3f3359370d
Former-commit-id: 9383d97579
2013-02-07 16:36:53 -06:00
Steve Harris
bbe92e6824
13.2.1-6 baseline
...
Former-commit-id: d66ad2f77b
[formerly d0752de66c
] [formerly a46e33f06e
[formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
2013-02-07 16:00:39 -06:00
Steve Harris
1f44caaedb
13.2.1-6 baseline
...
Former-commit-id: cc48fa4fc6
[formerly b80782b081
] [formerly 53adfb7345
[formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]
Former-commit-id: 53adfb7345
Former-commit-id: dee1480773
2013-02-07 16:38:44 -05:00
Matt Nash
a4b72307da
Issue #1570 add concurrent python functionality, address some comments
...
Change-Id: I9d7f5491f0895e252d04979458004e64e39f6805
Former-commit-id: f785808ff9
[formerly 2b84120235
] [formerly 53f58684a0
[formerly 02a6471f1407593fcf39a724eb19bb4a7bc22626]]
Former-commit-id: 53f58684a0
Former-commit-id: e21ada775c
2013-02-07 12:01:42 -06:00
Max Schenkelberg
f186c355ac
Issue #1500 Sped up warngen text creation by calculating hatched polygon and area in Job when polygon or area changes, initializing velocity for template running when warngen starts, only requesting full warning records when they are requested for use from CurrentWarnings, and only requesting partial ActivateTableRecords for determining active watch info.
...
Change-Id: Ia120f2d20b99e4d152554727597b22af762413ac
Former-commit-id: f73d55e920
[formerly bb68c95589
] [formerly fdc5759b53
[formerly 26af6badfffd930b8051af8e33ff6897d6c87073]]
Former-commit-id: fdc5759b53
Former-commit-id: 014eaa1666
2013-02-06 17:21:13 -06:00
Bryan Kowal
9c7d8ca3d3
Issue #1555 - initial generic geometry resource
...
- refactored viz data access resources
- updated hydro factory based on existing hydro code
- geometric lines and polygons are now both rendered using wireframe shapes and the same logic
- relocated the data used to render the geometries to the resource
- points are created instead of circles for geometric points
- do not store legend text as a static variable in the abstract data access resource
- addressed peer review comments
Change-Id: Ic7792aede9e24445af541f01631886645a8cf1f0
Former-commit-id: 442a2f8fa4
[formerly a86d2b5769
] [formerly 1732e6b4ea
[formerly 04179bd343c3ec976c601e2856a3949e4515b472]]
Former-commit-id: 1732e6b4ea
Former-commit-id: c8a6b08394
2013-02-06 12:03:40 -06:00
Steve Harris
b119d66cda
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: da43a7a8ca
[formerly 4bc8e9ab5c
] [formerly 5ee47e098d
[formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ad515e28f
2013-02-06 11:12:01 -06:00
Steve Harris
48a0ffda4d
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: 14f23d4227
[formerly a16ac7819c
] [formerly 6c6b53679b
[formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]
Former-commit-id: 6c6b53679b
Former-commit-id: 28ddc9bad8
2013-02-06 11:08:53 -06:00
Steve Harris
7497a15e22
13.2.1-5 baseline
...
Former-commit-id: a6b3cde1ff
[formerly 232734091d
] [formerly 146fcc6da8
[formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 146fcc6da8
Former-commit-id: 1c602ec3a7
2013-02-06 11:02:32 -06:00
Nate Jensen
36810f3daa
Merge "Issue #1553 initial implementation of radar factory Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574" into development
...
Former-commit-id: 3f2aa931db
[formerly ad4d5d6816
] [formerly 86c14f8275
[formerly a2c55643fe41a58029089aec2689a4678e7f8f6d]]
Former-commit-id: 86c14f8275
Former-commit-id: 7304e763d6
2013-02-05 17:37:29 -06:00
Lee Venable
3444c01cfa
Merge "Issue #1550 - Add ability for MPE to preload maps on perspective open." into development
...
Former-commit-id: 6e7f552972
[formerly 42941bb2be
] [formerly cc34190c18
[formerly 07a61258f12fe6cf793467af271d060882953adc]]
Former-commit-id: cc34190c18
Former-commit-id: 0dd325ed88
2013-02-05 16:22:30 -06:00
Mike Duff
1fc97f07fe
Issue #1580 - Fix spring config
...
Former-commit-id: 3f3554a559
[formerly 6b51c66923
] [formerly 65deb06061
[formerly 020c39ec162e786ebb8b5a9a2feac7ae415e5036]]
Former-commit-id: 65deb06061
Former-commit-id: 62e25af348
2013-02-05 15:49:22 -06:00
Mike Duff
cd52a94032
Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
...
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a
Former-commit-id: 06ddb6cce7
[formerly 1b1d00f8a9
] [formerly 36909dd6c0
[formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]
Former-commit-id: 36909dd6c0
Former-commit-id: 4400265394
2013-02-05 15:13:51 -06:00
Dustin Johnson
4fecb5f6a7
Merge "Issue #1543 Break apart the retrieval process to support SBN capabilities. Made interfaces for various aspects of retrieval that are Spring injectable. Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept." into development
...
Former-commit-id: 9da65d97bc
[formerly 39cfcf40a8
] [formerly 6f95400d1c
[formerly b6c403f6c8e22397d1df178ffddc9b8951f7e683]]
Former-commit-id: 6f95400d1c
Former-commit-id: 2f900fb18f
2013-02-05 14:36:12 -06:00
Bryan Kowal
efe288c82c
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: 81da18f851
[formerly 7815b651bb
] [formerly 5fea87f1dd
[formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]
Former-commit-id: 5fea87f1dd
Former-commit-id: 99994d3151
2013-02-05 13:25:15 -06:00
Dave Hladky
b134741e4c
Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
...
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf
Former-commit-id: 7b49430e34
[formerly c0712160d7
] [formerly 7af5aab08a
[formerly 9c7d813ee094864e0a7da60d54dee5424c50efba]]
Former-commit-id: 7af5aab08a
Former-commit-id: f6bd4ea0fa
2013-02-05 12:23:56 -06:00
Richard Peter
501e305a66
Merge "Issue #1517 Added SPC Prob menu changes." into development
...
Former-commit-id: e4894a01fd
[formerly 74b3cc23ff
] [formerly 4170ba9558
[formerly 153173d6f07aaf135be6e5422c893942deef5371]]
Former-commit-id: 4170ba9558
Former-commit-id: a0807f8ecb
2013-02-05 09:23:20 -06:00
Steve Harris
72ca459f76
13.2.1-5 baseline
...
Former-commit-id: d6a9d68c10
[formerly a11ab8f26e
] [formerly d26a488ee4
[formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]
Former-commit-id: d26a488ee4
Former-commit-id: 4a745c9483
2013-02-04 16:31:26 -06:00
Steve Harris
39cb931bc9
13.2.1-5 baseline
...
Former-commit-id: 1a74d2f0c5
[formerly b4014794de
] [formerly f99f99e2f5
[formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]
Former-commit-id: f99f99e2f5
Former-commit-id: 418d8ca0d8
2013-02-04 16:36:29 -05:00
Steve Harris
24ff063657
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 9595fefb4b
[formerly d997d99f05
] [formerly f380667b34
[formerly 815e8b741b173044f8f20f537674d685b50ed6af]]
Former-commit-id: f380667b34
Former-commit-id: 930f1f13c0
2013-02-04 15:26:44 -06:00
Bryan Kowal
32012b9f64
Issue #1553 - remove duplicated "image" plugin
...
Change-Id: Ia0328efb3f45dc233118b7ef209e53b1f4ae1f5e
Former-commit-id: af697a65d1
[formerly 1b7e268feb
] [formerly dd6abb0ba1
[formerly a16493410bddeca8982140a3a41922d46ee479b4]]
Former-commit-id: dd6abb0ba1
Former-commit-id: 7bb3bef057
2013-02-04 13:07:35 -06:00
Nate Jensen
53bf879c83
Issue #1553 fix build
...
Change-Id: Ia716b2bd6ecd3c8e045ad91c4c3ca063690b91c3
Former-commit-id: f044441759
[formerly ea6dec5db8
] [formerly dd854cdb85
[formerly d46cda9c95a94572fa2e6c89ed4298a55cf76e15]]
Former-commit-id: dd854cdb85
Former-commit-id: d15a57427e
2013-02-04 09:34:40 -06:00
Dustin Johnson
2940a059d1
Issue #1543 Break apart the retrieval process to support SBN capabilities.
...
Made interfaces for various aspects of retrieval that are Spring injectable.
Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept.
Amend:
Check whether debug is enabled prior to debug message.
Move log of request xml inside null check.
Change-Id: I5e3fe835f028cb93c98abce9735d3d59cfc663dc
Former-commit-id: cf063000ca
[formerly 3b20efeb7d
] [formerly 1a17e4a0f5
[formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]]
Former-commit-id: 1a17e4a0f5
Former-commit-id: b5f69e21d8
2013-02-04 09:00:33 -06:00