xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6863 commits 31 branches 40 tags 3.8 GiB
Commit graph

6863 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Phillippe
c00e99fa33 Issue #3560 Fix for registry memory issue 
Former-commit-id: 2da57d3bc2 [formerly ab8b2ef473 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]
Former-commit-id: ab8b2ef473
Former-commit-id: 12914fb1e5
 2014-09-02 10:00:35 -05:00
Nate Jensen
2d5df2705f Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1 
Former-commit-id: fe457e89a7 [formerly 2c209af1fa [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]
Former-commit-id: 2c209af1fa
Former-commit-id: e673ed62bd
 2014-09-02 09:53:25 -05:00
Nate Jensen
9911f52bba Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1 
Former-commit-id: 13f1a5a8ab [formerly c4333e030c [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]
Former-commit-id: c4333e030c
Former-commit-id: 3efe4cf3b0
 2014-09-02 09:52:38 -05:00
Nate Jensen
c77003fe38 Omaha #3356 fix cave startup 
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595

Former-commit-id: ef99d43451 [formerly 4395ab6f11 [formerly d326ee1a73a852e5534e76bf2148afd7646adb7e]]
Former-commit-id: 4395ab6f11
Former-commit-id: 9bf9e3a658
 2014-09-02 09:50:08 -05:00
Dave Hladky
4b22309742 Issue #3564 Allow for un-authenicated WFS HTTPS connections. 
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a

Former-commit-id: 82fd7189b9 [formerly 9c3b002990 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]
Former-commit-id: 9c3b002990
Former-commit-id: 534b784843
 2014-09-02 09:38:21 -05:00
Richard Peter
7a17f81e58 Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1 
Former-commit-id: 40917b6118 [formerly 6f66071eca [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]]
Former-commit-id: 6f66071eca
Former-commit-id: 5db143cd92
 2014-09-02 09:23:58 -05:00
Steve Harris
9e79ff1cff Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4 
Former-commit-id: e7705c328e [formerly 3b6a003884 [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]
Former-commit-id: 3b6a003884
Former-commit-id: f7e39c9d6f
 2014-09-02 08:12:49 -05:00
Steve Harris
db74ef9c6d Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2 
Former-commit-id: 425e8243f2 [formerly db74dc031e [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]
Former-commit-id: db74dc031e
Former-commit-id: 142f1bff66
 2014-09-02 08:09:48 -05:00
Mark Peters
fc72ed828c Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective 
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: 045746ec21 [formerly e35a7451c6 [formerly 8099cbe2359334d6718761046a1475fca687af35]]
Former-commit-id: e35a7451c6
Former-commit-id: 966879b8a1
 2014-08-29 16:17:22 -05:00
Ben Steffensmeier
0f79692cd7 Issue #3543 Fix gl datamapping of data with NaN conversions. 
Former-commit-id: 190893e807 [formerly 22f93b6905 [formerly bc12be9bb6e8c7f63550602f51bca3448c21d4c6]]
Former-commit-id: 22f93b6905
Former-commit-id: 9c2c00c71e
 2014-08-29 15:08:03 -05:00
Mark Peters
b906c8054b Omaha #3569 Split Volume Browser planes menus into multiple reusable components. 
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9

Former-commit-id: 91f2b365a1 [formerly 097ce54969 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]
Former-commit-id: 097ce54969
Former-commit-id: 86b9016338
 2014-08-29 15:05:29 -05:00
Kiran.Shrestha
b4a897c5a7 ASM #506 - TextWS: Unable to save unofficial text products from text editor. 
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6

Former-commit-id: d8bd6a9c70 [formerly a285439c08 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]
Former-commit-id: a285439c08
Former-commit-id: 3abf28f856
 2014-08-29 13:50:55 -04:00
Ron Anderson
0bb6076cdc Omaha #3459 Ensure font is initialized before queryJob runs, 
Additional refactoring to someday allow ZoneSelectorResource to use more common code.

Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062

Former-commit-id: de490ea582 [formerly 8583386e5f [formerly a1896437f432bcb360365d28a0ee7377cec565af]]
Former-commit-id: 8583386e5f
Former-commit-id: f3f2ec8843
 2014-08-29 12:04:52 -05:00
Nate Jensen
1f087e5f0c Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1 
Former-commit-id: c60dfb889c [formerly 16191b10ab [formerly 3482282527df3ffd13c93d1a5d63d52ce79f8b2b]]
Former-commit-id: 16191b10ab
Former-commit-id: 47261a4ac4
 2014-08-29 11:16:16 -05:00
Steve Harris
12cd8db99b Omaha #3132 - removing duplicated com.raytheon.uf.viz.core 
Former-commit-id: c49eabbb45 [formerly aedf89c00b [formerly 94468f09bd626bd2ff26e7312ceede154f427664]]
Former-commit-id: aedf89c00b
Former-commit-id: f51ceee718
 2014-08-29 11:05:34 -05:00
Ron Anderson
30ef2a7667 Omaha #3561 Yet another attempt to fix combinations file updating 
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f

Former-commit-id: 9f37d7914a [formerly bd52b5a924 [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]
Former-commit-id: bd52b5a924
Former-commit-id: 89cde78ea6
 2014-08-29 10:45:54 -05:00
Steve Harris
3619a11a8a Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]
Former-commit-id: 793064063b
Former-commit-id: bddf9c0f27
 2014-08-29 10:17:52 -05:00
Baoyu Yin
52f4873f3f VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563 
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1

Former-commit-id: bfc550b378 [formerly bf5bb1bacf [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]
Former-commit-id: bf5bb1bacf
Former-commit-id: cbc7d2813f
 2014-08-29 10:17:54 -04:00
Brian.Dyke
31c13bf0bf Merge branch 'master_14.2.4' into asm_14.2.4 
Former-commit-id: a2f66c8d97 [formerly 37c926973c [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]
Former-commit-id: 37c926973c
Former-commit-id: a5519a28d9
 2014-08-29 10:07:14 -04:00
Brian Clements
c0b132d6ee Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass 
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: cfeb16eff8 [formerly b352bd3944 [formerly b3482522860408c2d052261e845899cf73c2ce96]]
Former-commit-id: b352bd3944
Former-commit-id: 981390eb22
 2014-08-29 08:55:58 -05:00
Juliya Dynina
d911b87c7e Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3 
Former-commit-id: 58a3df78a8 [formerly 169dc0ba43 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]
Former-commit-id: 169dc0ba43
Former-commit-id: 5f001b7ad7
 2014-08-28 15:52:11 -05:00
Nate Jensen
dc6e307895 Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1 
Former-commit-id: 822f1a20b0 [formerly 67d5cb52ae [formerly afd5131062926a78942db59f35a5c2e719a542da]]
Former-commit-id: 67d5cb52ae
Former-commit-id: 8f0bd2bb84
 2014-08-28 14:32:57 -05:00
Ana Rivera
b03dd41331 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617 
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]
Former-commit-id: 160dabc4d1
Former-commit-id: e033ed5546
 2014-08-28 18:38:26 +00:00
Roger Ferrel
60d6b770aa Issue #3553 - Force redisplay of data set table after all labels are generated. 
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec

Former-commit-id: ef5dfb1f93 [formerly 6f8c6d6aa1 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]
Former-commit-id: 6f8c6d6aa1
Former-commit-id: 15c73be56c
 2014-08-28 13:10:11 -05:00
David Friedman
16c903e2c5 ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired 
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa

Former-commit-id: d5c086a022 [formerly de6e79f9e3 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]
Former-commit-id: de6e79f9e3
Former-commit-id: 9c2545ed64
 2014-08-28 18:08:23 +00:00
Daniel.Huffman
39f7795b7c ASM #16715 - Reverted and augmented Airports.xml and Fix.xml 
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e

Former-commit-id: ca2aa8811b [formerly c89a7169b0 [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]
Former-commit-id: c89a7169b0
Former-commit-id: c3731d5622
 2014-08-28 17:20:30 +00:00
Nate Jensen
c383a50c2c Omaha #3356 inject spatial query through spring 
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d

Former-commit-id: 8f226399f7 [formerly 58c85c76ef [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]
Former-commit-id: 58c85c76ef
Former-commit-id: baece22d79
 2014-08-28 11:46:25 -05:00
Nate Jensen
637dbddd2f Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1 
Former-commit-id: 0ee832fc2f [formerly 625f0db18f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]]
Former-commit-id: 625f0db18f
Former-commit-id: 9fe0e6df69
 2014-08-28 11:30:45 -05:00
Nate Jensen
579881a4fe Merge "Omaha #3562 jetty upgrade change for dataserver" into omaha_14.4.1 
Former-commit-id: e0d861461b [formerly c8c93dccf1 [formerly 96882cbdc801c37e63ca0bc1ce950cbdffd97122]]
Former-commit-id: c8c93dccf1
Former-commit-id: 22f24dbb13
 2014-08-28 11:23:43 -05:00
steve.naples
bf9924b0e9 ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC 
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138

Former-commit-id: ff52f1dc0a [formerly 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]
Former-commit-id: 1856a05319
Former-commit-id: 4205d83452
 2014-08-28 16:08:17 +00:00
Ron Anderson
1e05b981fa Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily 
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34

Former-commit-id: 2b88ade974 [formerly bb1e80b844 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]
Former-commit-id: bb1e80b844
Former-commit-id: dc185b8dd1
 2014-08-28 10:43:54 -05:00
David Friedman
bb421fd3e4 ASM #15658 - WarnGen: inclusion of watch information in marine products 
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]
Former-commit-id: a2dfe8e8f6
Former-commit-id: ea1e9feb1d
 2014-08-28 15:43:32 +00:00
Nate Jensen
b036c5b851 Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1 
Former-commit-id: afe94aca08 [formerly de69231d3a [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]
Former-commit-id: de69231d3a
Former-commit-id: fb0829fd4d
 2014-08-28 10:40:50 -05:00
Brian.Dyke
cbfd380b43 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4 
Former-commit-id: a24794ca7b [formerly 47ae6015e5 [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]
Former-commit-id: 47ae6015e5
Former-commit-id: 76bd6575b6
 2014-08-28 11:39:48 -04:00
Baoyu Yin
fd119c9495 VLab Issue #4554 - AWIPS2_DR_17469 Radar Digital Vertical Integrated Liquid wrongly capped at value of >60 kg*m^-2; fixes #4554 
Change-Id: I78b45576bd2be9e3baa1f85da5a124de60842e3b

Former-commit-id: ebc018c7f6 [formerly 2d3589e7af [formerly 8d3b878a9c32b77e7bb19b087e7da8de492a4481]]
Former-commit-id: 2d3589e7af
Former-commit-id: 8e88237eab
 2014-08-28 09:50:26 -04:00
Baoyu Yin
667aec7c35 VLab Issue #4553 - AWIPS2_DR_16047 Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553 
Change-Id: I20f7aeb70828c27e1e6250c54f90f82b88390056

Former-commit-id: dc1b76a996 [formerly a42c9f6bc2 [formerly 3aabef4b96bfb848bb5201d8eac2681b3dc49c83]]
Former-commit-id: a42c9f6bc2
Former-commit-id: 01b3186495
 2014-08-28 08:34:34 -04:00
Nate Jensen
7221b94904 Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1 
Former-commit-id: 8536f6681a [formerly 2710aed225 [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]]
Former-commit-id: 2710aed225
Former-commit-id: 7bf0d7cd2a
 2014-08-27 16:27:40 -05:00
Roger Ferrel
2944c3770f Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml. 
Former-commit-id: 9154ef60bb [formerly fa42c4069a [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]
Former-commit-id: fa42c4069a
Former-commit-id: 0147449477
 2014-08-27 15:06:52 -05:00
Brian Clements
78e961b8f5 Omaha #3562 jetty upgrade change for dataserver 
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663

Former-commit-id: 66da9e63b7 [formerly 3595bd2728 [formerly bb90464f68d562105809ef36f88869ff4570095c]]
Former-commit-id: 3595bd2728
Former-commit-id: ab4eaee171
 2014-08-27 13:18:13 -05:00
Steve Harris
b551b21437 Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2 
Former-commit-id: d3b18900b3 [formerly 891019aadd [formerly 579781387325a36e27135b8384b2a8b14cb38317]]
Former-commit-id: 891019aadd
Former-commit-id: 080a50d28c
 2014-08-27 11:34:06 -05:00
Brian.Dyke
0a5ddf7457 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: e654318431
Former-commit-id: a08db8d73d
 2014-08-27 11:19:19 -04:00
Nate Jensen
6a20d84a8a Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1 
Former-commit-id: 7acf4a04b2 [formerly 6fca563d21 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]]
Former-commit-id: 6fca563d21
Former-commit-id: 697e1c0b79
 2014-08-27 09:54:49 -05:00
Nate Jensen
1ea041a01e Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1 
Former-commit-id: 1ad37de1ef [formerly 2d1d18b2ff [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]]
Former-commit-id: 2d1d18b2ff
Former-commit-id: 0edb5fc46c
 2014-08-27 09:54:24 -05:00
Nate Jensen
a70df06392 Omaha #3132 fix compilation issue from merge 
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba

Former-commit-id: 3f7170f862 [formerly 0160955244 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]]
Former-commit-id: 0160955244
Former-commit-id: 2f0b209e10
 2014-08-26 18:22:26 -05:00
Brian Clements
9509568efa Omaha #3539 reworked link to editor action to avoid recursion warning 
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01

Former-commit-id: f871058f67 [formerly a609334abf [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]
Former-commit-id: a609334abf
Former-commit-id: a39a997a8d
 2014-08-26 17:22:20 -05:00
Brian Clements
11fa1b962c Omaha #3503 Composite product generators init after spring beans are loaded 
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09

Former-commit-id: b88f012e69 [formerly 095f84e71f [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]]
Former-commit-id: 095f84e71f
Former-commit-id: 5dc5530120
 2014-08-26 17:12:34 -05:00
Nate Jensen
4a48867a81 Omaha #3356 configure path manager factory before spring initialization 
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: fdc4cc60b9 [formerly dbbf012a34 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]
Former-commit-id: dbbf012a34
Former-commit-id: f84e89b694
 2014-08-26 16:45:00 -05:00
Steve Harris
33b4901c09 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]
Former-commit-id: 99ae9bdc10
Former-commit-id: 8c5026314c
 2014-08-26 16:25:21 -05:00
Nate Jensen
bb4552ee2a Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1 
Former-commit-id: b92d94d19d [formerly 704ebac10a [formerly d5db15de813a41767a1a10b0bfa07eb88c8dff6e]]
Former-commit-id: 704ebac10a
Former-commit-id: 41e6446b49
 2014-08-26 13:42:13 -05:00
Nate Jensen
9060f82413 Merge "Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env" into omaha_14.4.1 
Former-commit-id: 448887b913 [formerly 46fc72804a [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]]
Former-commit-id: 46fc72804a
Former-commit-id: e4df37dd05
 2014-08-26 13:39:15 -05:00