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
Nate Jensen
017ebf0cd1
Merge "Issue #1570 add concurrent python functionality, address some comments" into development
...
Former-commit-id: fa39d675e2
[formerly f204191837
] [formerly efaa83d708
[formerly ea35d3e1ea8b4d7bf7f532e2e1ee1513888d61ba]]
Former-commit-id: efaa83d708
Former-commit-id: 276b302002
2013-02-07 15:19:05 -06:00
Lee Venable
b3c1c2d0ec
Merge "Issue #1578 Changes for non-blocking PDC_SaveDlg." into development
...
Former-commit-id: 500cebc029
[formerly fd97a3d4be
] [formerly 9fb1bb41d9
[formerly 6bd655fed2cf39fa465f4f5c4240e1cb8fc86e31]]
Former-commit-id: 9fb1bb41d9
Former-commit-id: f26a7065ae
2013-02-07 14:30:23 -06:00
Richard Peter
93eddbbedd
Merge "Issue #1586 add color to area validation." into development
...
Former-commit-id: d26d8bbe31
[formerly 761b02e93e
] [formerly 27ce3e37f2
[formerly f8a90106eef02f27f65a6a0eda5e92a5720adf90]]
Former-commit-id: 27ce3e37f2
Former-commit-id: 9f6078380a
2013-02-07 14:22:46 -06:00
Roger Ferrel
4e773c2c9c
Issue #1578 Changes for non-blocking PDC_SaveDlg.
...
Change-Id: I29228892970a5349c352a34880087afe48a339da
Former-commit-id: ba3fa2a509
[formerly ad2639601e
] [formerly d4660004f3
[formerly 0ea655d32be4e0e13bdade510bcc6979d6da3799]]
Former-commit-id: d4660004f3
Former-commit-id: bb84fe5f68
2013-02-07 14:08:59 -06:00
Lee Venable
c8ddcf394b
Merge "Issue #1560 - Additional fix to HTS page up/down reload problem." into development
...
Former-commit-id: 56ec704522
[formerly 8d7c0e3b6a
] [formerly 1f1b171862
[formerly d36aa52d8d212aaef3bc68c96a24956696fef513]]
Former-commit-id: 1f1b171862
Former-commit-id: e70a758f63
2013-02-07 13:06:09 -06:00
Lee Venable
a833ba8bd7
Merge "Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg." into development
...
Former-commit-id: 21792d44f9
[formerly e4d4743ef7
] [formerly 362b851388
[formerly 4958257a3994d0507b256921cf459fe7f1556c97]]
Former-commit-id: 362b851388
Former-commit-id: 4667c8475c
2013-02-07 13:05:13 -06:00
Lee Venable
1e2fa53f57
Merge "Issue #1578 Changes for non-blocking FilteringDlg and bug fix to TimeSeriesDlg." into development
...
Former-commit-id: 758d23cc43
[formerly 2b63f58269
] [formerly 3932a3e7c2
[formerly 002f832ca109fdd0df9112d2341aeab038aba0db]]
Former-commit-id: 3932a3e7c2
Former-commit-id: a7de993595
2013-02-07 12:58:13 -06:00
Roger Ferrel
940d442f6f
Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg.
...
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42
Former-commit-id: 24c88a1673
[formerly 130fa3f73d
] [formerly 873f932f8e
[formerly 64c6e3b9812dc7232bd36feff181805c4fd504d9]]
Former-commit-id: 873f932f8e
Former-commit-id: f30b5846c1
2013-02-07 12:46:01 -06:00
Lee Venable
77bb92dd26
Merge "Issue #1578 Changes for non-blocking GageLegend." into development
...
Former-commit-id: 09cb9bbc55
[formerly 4915d89fb8
] [formerly f0cdda345d
[formerly e00c153669b699e2d2dd63fec85b9f891688a5d9]]
Former-commit-id: f0cdda345d
Former-commit-id: 6e9094a27e
2013-02-07 12:37:22 -06: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
Roger Ferrel
27339cbd7f
Issue #1578 Changes for non-blocking FilteringDlg and bug fix to TimeSeriesDlg.
...
Change-Id: Ib024fe2051d753c001bbd43079c629cc2cca8e9b
Former-commit-id: a87fd5c9f6
[formerly 2c10f90df0
] [formerly 0186ec3b68
[formerly 1994880374ba0fcccedfde60bff6645acbafabae]]
Former-commit-id: 0186ec3b68
Former-commit-id: 45d3bcb6e9
2013-02-07 11:12:51 -06:00
Nate Jensen
e9e560e67b
Merge "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." into development
...
Former-commit-id: d6ff3d9ca8
[formerly e2593ee0ab
] [formerly e993b72a39
[formerly fd8ff178849afdf24c5ff01c9b709a71eb1bee87]]
Former-commit-id: e993b72a39
Former-commit-id: 2088daf6d5
2013-02-07 10:25:57 -06:00
Mike Duff
8b8bd8b190
Issue #1560 - Additional fix to HTS page up/down reload problem.
...
Former-commit-id: 307b36486d
[formerly 11aae8b26f
] [formerly 4f1bdd295a
[formerly dbc68b231bbf9fda21c7b8faf09aebaa1879143a]]
Former-commit-id: 4f1bdd295a
Former-commit-id: 159702d551
2013-02-07 10:22:40 -06:00
Roger Ferrel
b04dee98c7
Issue #1578 Changes for non-blocking DataTashCanDlg and clean up to data managers.
...
Review changes 2.
Change-Id: I4d697ccc5a2e5ab63dfef3e52e88d039adfcdaa0
Former-commit-id: b0d1575727
[formerly b2dc220bcd
] [formerly dd85695eb9
[formerly 7d2e157d20a009a2192b35f95252bdad895a91c5]]
Former-commit-id: dd85695eb9
Former-commit-id: 0731398ac7
2013-02-07 09:12:24 -06:00
Roger Ferrel
86e8bb60c1
Issue #1578 Changes for non-blocking GageLegend.
...
Change-Id: I5ae04e8eaf8ebf33bd6a6466925102cfd12f1550
Former-commit-id: b2f4b219ac
[formerly a002b9119d
] [formerly 845e05782c
[formerly 7bde6bde475269b700826ce699a2437ea6dc9cad]]
Former-commit-id: 845e05782c
Former-commit-id: 00b4dc560b
2013-02-07 09:05:51 -06:00
Roger Ferrel
d9197606ff
Issue #1578 Changes for non-blocking FlashFloodGuidanceDlg.
...
Change-Id: I00efe50ba8e0fe11fcca560ef2d07293c9bdf771
Former-commit-id: 0c5e92eb7f
[formerly bb69390c9b
] [formerly 78a7d02fd2
[formerly d3fd2d7f0591f6fbe15d522a6c909f4509fede94]]
Former-commit-id: 78a7d02fd2
Former-commit-id: c1b45bd6c9
2013-02-07 08:27:18 -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
Ben Steffensmeier
45b75823ac
Issue #1586 add color to area validation.
...
Former-commit-id: 80f8dc50f9
[formerly f073984ce6
] [formerly 8a233105bc
[formerly 452ba74bb84a2531b617675c4ee80ef4b008cd34]]
Former-commit-id: 8a233105bc
Former-commit-id: 6a8bd463a6
2013-02-06 13:43:27 -06:00
Roger Ferrel
fc8537fb12
Issue #1578 Code clean up for non-blocking dialogs.
...
Changes from code review.
Change-Id: I9f95dd07736f96af8cb1116030a9fb778fe4b047
Former-commit-id: 5e2b33206c
[formerly 581b04f8f7
] [formerly db818dfd35
[formerly e3c21436e1186e467daf071bb723a2c31d6d3579]]
Former-commit-id: db818dfd35
Former-commit-id: 1029538171
2013-02-06 13:42:57 -06:00
Bryan Kowal
fc84326815
Issue #1555 - improve Geometry loop
...
Change-Id: I124b0f41f2acd9dd2a5b4ec16c24d8bcfc64c417
Former-commit-id: 9ee71bc226
[formerly f5c3e20b3a
] [formerly cdafa71827
[formerly a8c222a7bb60ccdd0a431c8781488efc641a26c5]]
Former-commit-id: cdafa71827
Former-commit-id: 9b572f0eb4
2013-02-06 12:32:40 -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
9b9072902f
Merge "Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction." into development
...
Former-commit-id: b6c943fe47
[formerly ab300ca0d5
] [formerly 8f5f26a058
[formerly 97bd7f31af2db7dd483d4fe4d7da271d2fe3a915]]
Former-commit-id: 8f5f26a058
Former-commit-id: 2264a66c09
2013-02-05 16:39:14 -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
Roger Ferrel
30a1f42557
Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction.
...
Change-Id: Ie249af9dcb2b84db686bca5c0936c2157d40c507
Former-commit-id: a558cbc03a
[formerly eaa3834f6b
] [formerly dc965dc82a
[formerly 413491362e25a08b7e43f86987cc059f794a674b]]
Former-commit-id: dc965dc82a
Former-commit-id: d9d53340bb
2013-02-05 16:13:08 -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
81d0423913
Merge "Issue #1543 Add ability to save/read dods files back to net.dods" into development
...
Former-commit-id: 7b2adf535e
[formerly df987e6204
] [formerly 0ceb35c131
[formerly 062ed14d60a8b3d29650ce78fa449f69f40d413b]]
Former-commit-id: 0ceb35c131
Former-commit-id: d08a9b3b13
2013-02-05 14:36:31 -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
Greg Armendariz
927046da46
Merge "Issue #1577 - deploy-install and AWIPS II ant task updates" into development
...
Former-commit-id: fc246471f1
[formerly 85d3f17617
] [formerly 5bcdb25925
[formerly 3e0d46e342a60f245b1519e1741469d9269ab079]]
Former-commit-id: 5bcdb25925
Former-commit-id: 9223f40f3f
2013-02-05 14:07:45 -06:00
Dustin Johnson
c81cb3d60b
Issue #1543 Add ability to save/read dods files back to net.dods
...
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf
Former-commit-id: efe1bcc4b5
[formerly cd381cb819
] [formerly febe492056
[formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]
Former-commit-id: febe492056
Former-commit-id: fffbb32775
2013-02-05 14:07:30 -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
Nate Jensen
956b1c57db
Merge "Issue #1567 refactor updates of plots for efficiency/clarity" into development
...
Former-commit-id: 317e225992
[formerly 532bec2967
] [formerly 0a64da0b72
[formerly e41fb23e150d4c447823593016a698dabcb8fae5]]
Former-commit-id: 0a64da0b72
Former-commit-id: d6de86b57b
2013-02-05 13:21:21 -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
Nate Jensen
029aa60957
Issue #1567 refactor updates of plots for efficiency/clarity
...
Change-Id: Id3d52ef2eb671138c078bc721c690867ba3dada3
Former-commit-id: 48a503e3dd
[formerly b9b730aac5
] [formerly 2a3f3e6a40
[formerly b2788eb6bbc807d6fecc8e097e15dfbcb3ff8105]]
Former-commit-id: 2a3f3e6a40
Former-commit-id: a56d672039
2013-02-05 11:07:21 -06:00
Richard Peter
2e02b222f2
Merge "Issue #1576 - updated qpid 0.18 rpms" into development
...
Former-commit-id: bb317b1acf
[formerly 221a6e1ca1
] [formerly b774fadb60
[formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]
Former-commit-id: b774fadb60
Former-commit-id: fa4dd004f9
2013-02-05 09:25:55 -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
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
Bryan Kowal
fe70d57c36
Issue #1576 - updated qpid 0.18 rpms
...
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms
Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222
Former-commit-id: 145cd06eae
[formerly 1678618015
] [formerly 09523f1e84
[formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]
Former-commit-id: 09523f1e84
Former-commit-id: 513bda11bc
2013-02-04 12:31:23 -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
Brad Gonzales
8fc5c18ebd
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: 35cc853c74
[formerly f459554e33
] [formerly 5bc6dd5498
[formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]
Former-commit-id: 5bc6dd5498
Former-commit-id: f3ef309293
2013-02-04 08:52:33 -06:00
Ben Steffensmeier
8cbde9ef7d
Issue #1553 initial implementation of radar factory
...
Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574
Former-commit-id: efc647e6ba
[formerly ed60f1a696
] [formerly 0eb24c11e2
[formerly 1db5404b22544dbc8954825121217c0ffce95fa0]]
Former-commit-id: 0eb24c11e2
Former-commit-id: 681b30b3d8
2013-02-01 16:29:13 -06:00
Nate Jensen
d996064b91
Merge "Issue #1553 move radar units into common plugin for use in data access factory Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f" into development
...
Former-commit-id: d7677be8a4
[formerly f77a1dc85c
] [formerly e1166c246c
[formerly 358b990e43d0f5952ee3c33521778541bd1b7c04]]
Former-commit-id: e1166c246c
Former-commit-id: 3ab7c693de
2013-02-01 15:01:24 -06:00
Ben Steffensmeier
16be5e1ab5
Issue #1575 apply persisted colormap attributes to grid resources
...
Former-commit-id: f8b9b2c987
[formerly 07d053bb3c
] [formerly 1884c77278
[formerly 4bb77ee1763890a355a0ac5eefb8c14c12e13780]]
Former-commit-id: 1884c77278
Former-commit-id: a2a95a17aa
2013-02-01 12:45:39 -06:00