Commit graph

4129 commits

Author SHA1 Message Date
Greg Armendariz
fe5cf3f8e6 Omaha #3299 - Updated deploy-install to find features
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2

Former-commit-id: 1a3ca4f8df [formerly 6a5463ab87 [formerly a25d39959ccdc41ab99e0eaf4ad87559adfcb362]]
Former-commit-id: 6a5463ab87
Former-commit-id: 2fd4ace0a2
2015-02-25 09:51:49 -06:00
Steve Harris
20e23e0a9f Merge tag 'OB_14.4.1-13m' into omaha_14.4.1
14.4.1-13


Former-commit-id: 0de5743e1f [formerly 12929f7412 [formerly c75f0f600cc312a83275b767165471b458da18b7]]
Former-commit-id: 12929f7412
Former-commit-id: fedaf58f2a
2015-02-20 09:57:49 -06:00
Ben Steffensmeier
7936725972 Omaha #4135 Fix speckles, set no data value for derived satellite data.
Former-commit-id: 22822c1a65 [formerly 19f1d29e52 [formerly 65a50fe832ef6260dfd0e02c9fad9cd2eed6f6f2]]
Former-commit-id: 19f1d29e52
Former-commit-id: 6ec30c1372
2015-02-17 11:56:57 -06:00
Nate Jensen
76e6cd5eca Merge "Omaha #4121 - Fix bug in caching uncovered when hperadarresult table data were corrected." into omaha_14.4.1
Former-commit-id: 61039e84a9 [formerly 8f39a549dc [formerly 042882e840e7aacc356f89e6385ab4ff63a6a589]]
Former-commit-id: 8f39a549dc
Former-commit-id: dc74e320e1
2015-02-17 08:47:55 -06:00
Mike Duff
b6379af6fb Omaha #4121 - Fix bug in caching uncovered when hperadarresult table data were corrected.
Change-Id: I88611082397933676c13c58f65fb29a5745ac263

Former-commit-id: 105a862d2e [formerly 705d5b4f2b [formerly f4d4701fd39202f0610e6c4621f106557648050d]]
Former-commit-id: 705d5b4f2b
Former-commit-id: 8119fe20a0
2015-02-17 07:57:30 -06:00
Nate Jensen
540de7c432 Merge "Omaha #4117 fix 14.3/14.4 shared display interoperability bug" into omaha_14.4.1
Former-commit-id: 2a57d8e886 [formerly 7df06aeb3e [formerly 2f07a0d67efd0d12e80cec06256ce30931b55d97]]
Former-commit-id: 7df06aeb3e
Former-commit-id: c5a601012f
2015-02-13 09:20:02 -06:00
Fay.Liang
7c53d1fccc Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java

Former-commit-id: af8b95bb97 [formerly 8cdd180b0a [formerly fd4e0b9ada38ab93586088948809279e39a0374c]]
Former-commit-id: 8cdd180b0a
Former-commit-id: c95baa3c40
2015-02-13 09:34:24 -05:00
Fay.Liang
6d85666c42 Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 92d4e5b370 [formerly adc24b15b6 [formerly c08dc1a7d558fba175460ef8255fc3b7b1db5c71]]
Former-commit-id: adc24b15b6
Former-commit-id: b54c101e34
2015-02-13 09:29:20 -05:00
Brian Clements
a7e397d999 Omaha #4117 fix 14.3/14.4 shared display interoperability bug
14.4 now defaults to sending directly to user id (if known)

Change-Id: Id0d78a6f6287cebe7b6f110143b1b6a735078e5d

Former-commit-id: 62a0f31c60 [formerly 2d98b0616a [formerly 424c3630897847a6b2362418618d0806093223ce]]
Former-commit-id: 2d98b0616a
Former-commit-id: 9485b0354e
2015-02-12 09:34:38 -06:00
David Lovely
d71e91a297 Omaha #3300 Fixing merge errors in PointPrecipPlotResource
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4

Former-commit-id: 25f32b4c70 [formerly 56c3135aef [formerly e7968f03e688e7dbad9a2e87b9de7f0664997a5f]]
Former-commit-id: 56c3135aef
Former-commit-id: 260a818778
2015-02-12 09:16:30 -06:00
Ana Rivera
46215020b2 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java

Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209

Former-commit-id: 6191c93a9c [formerly 420132b396 [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]
Former-commit-id: 420132b396
Former-commit-id: 461db8a395
2015-02-11 22:00:40 +00:00
Steve Harris
a2d87f74f7 Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10


Former-commit-id: 9311e6f440 [formerly 3fe3d35339 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]
Former-commit-id: 3fe3d35339
Former-commit-id: e76330fac0
2015-02-11 15:53:38 -06:00
Fay.Liang
8a38eb3a97 Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 1208dbde06 [formerly 30859f6ee6 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]
Former-commit-id: 30859f6ee6
Former-commit-id: 8d4bab98d5
2015-02-11 15:36:05 -05:00
Ana Rivera
c2975ce69f Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f

Former-commit-id: c2f02ff4b2 [formerly bdb0e3aacb [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]
Former-commit-id: bdb0e3aacb
Former-commit-id: 631d700cf9
2015-02-10 14:41:19 +00:00
Fay.Liang
4bcae42022 Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: 43c7161dcf [formerly 59f3f87190 [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]
Former-commit-id: 59f3f87190
Former-commit-id: e3107ce1e4
2015-02-09 17:19:41 -05:00
Joshua Watson
9f53a8e0b6 VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848

Former-commit-id: f6cf02c893 [formerly 05c119663f [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]]
Former-commit-id: 05c119663f
Former-commit-id: cb6420914f
2015-02-06 16:06:37 -05:00
Nate Jensen
baafc97b60 Omaha #4089 harden safety of numpy dtypes in gfe arrays
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f

Former-commit-id: ea273e14bf [formerly b42dec0e4a [formerly ed77ff564520c8f6ad157dd115d37d69cbfab660]]
Former-commit-id: b42dec0e4a
Former-commit-id: ac02fc3a81
2015-02-05 18:03:47 -06:00
Richard Peter
e2be189c6a Merge "Omaha #4086 resurrect undead textws scripting code and make it work with TextDBQuery" into omaha_14.4.1
Former-commit-id: 948dce2527 [formerly d9eb0d8b55 [formerly 3196b314c2f75424933163112742c3646a0529b4]]
Former-commit-id: d9eb0d8b55
Former-commit-id: e7ee620ccb
2015-02-05 09:00:57 -06:00
Nate Jensen
b09704e3bf Omaha #4086 resurrect undead textws scripting code and make it work with
TextDBQuery

Change-Id: I33ddf04b2f02ee088f7b8956c5c31e874747ddf8

Former-commit-id: fa547ac3dd [formerly b6fe8b843e [formerly 9cdf82d433bd07289002c1f4df9f5242dce0de7e]]
Former-commit-id: b6fe8b843e
Former-commit-id: 49440898a8
2015-02-04 16:46:21 -06:00
Slav Korolev
9b4c91d9ba Omaha #3841 - Fixed saving problem for distance and time.
Former-commit-id: b8be69c429 [formerly 15ae209055 [formerly d6737249fc9d3db54a143345053acdfe889686bf]]
Former-commit-id: 15ae209055
Former-commit-id: bfbe322c73
2015-02-04 15:49:49 -05:00
Matthew Howard
6d90b07a36 Merge "ASM #17039 - Remove HighlightFramingCodes feature" into asm_14.4.1
Former-commit-id: cfc9629774 [formerly 4a46df6ed9 [formerly a68b74fd45f4da2dfe73085833432416380219f7]]
Former-commit-id: 4a46df6ed9
Former-commit-id: b482802e1e
2015-02-04 11:16:20 -05:00
Rici.Yu
5ea106504c ASM #17039 - Remove HighlightFramingCodes feature
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891

Former-commit-id: 1188dab0f4 [formerly 5470139b42 [formerly cb047745b4a5c523bd1ca26692c758d3e72d8ddc]]
Former-commit-id: 5470139b42
Former-commit-id: 0a489fea9c
2015-02-04 10:23:30 -05:00
Steve Harris
dfa3bb1060 Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
14.4.1-7


Former-commit-id: 2468be4dd1 [formerly f428e16ebb [formerly 88b43275725882327d4487733e3135489874de1f]]
Former-commit-id: f428e16ebb
Former-commit-id: 8f2af8e359
2015-02-03 17:18:57 -06:00
Steve Harris
d0a1514ece Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
14.4.1-6


Former-commit-id: b684848820 [formerly db185ed16c [formerly 6873606777f0c7c18928b0b0814050742c256dc2]]
Former-commit-id: db185ed16c
Former-commit-id: 80dae4bc15
2015-02-03 11:24:39 -06:00
Fay.Liang
eafbc466a4 Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: f1c34884a5 [formerly ae85ade54d [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]
Former-commit-id: ae85ade54d
Former-commit-id: 5550322f62
2015-02-03 11:24:57 -05:00
Ron Anderson
292c9777a4 Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
Former-commit-id: 933590f36a [formerly f280c0ab2e [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]]
Former-commit-id: f280c0ab2e
Former-commit-id: 8c6c42fe43
2015-02-02 15:04:51 -06:00
Bradley Mabe
8f0fb81e42 Merge remote branch 'origin/omaha_pgen' into ncep_14.4.1
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResource.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceGhost.java

Change-Id: I8506bb7deb4f57f5989d3513d682561948870593

Former-commit-id: de986a26ed [formerly 847c663329 [formerly a71f38e658319ac1109de6c73dfa29db35535f96]]
Former-commit-id: 847c663329
Former-commit-id: e8dc39ee79
2015-02-02 15:49:14 -05:00
Ron Anderson
f9c31d4237 Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2

Former-commit-id: 346ea417ea [formerly bdc365d9c9 [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]
Former-commit-id: bdc365d9c9
Former-commit-id: 67443be919
2015-02-02 11:26:59 -06:00
Fay.Liang
a601a2c9f7 Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py

Former-commit-id: 15f28c0245 [formerly 4ddd4cec81 [formerly 307e986b8e9ce89ad1eb7b28f88afe82c2596f30]]
Former-commit-id: 4ddd4cec81
Former-commit-id: 99b1511120
2015-02-02 10:06:58 -05:00
Ana Rivera
2be03903bc Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5

Former-commit-id: 070f0136ec [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]
Former-commit-id: ea92049aac
Former-commit-id: ccd0a40621
2015-01-30 19:29:29 +00:00
Slav Korolev
e44794e98b Omaha #3220 - Performance - Safe Seas, Snow, Fog.
Former-commit-id: 9e076f7970 [formerly 2bb8bc22a6 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]
Former-commit-id: 2bb8bc22a6
Former-commit-id: efee22d0fb
2015-01-29 14:50:02 -05:00
Steve Harris
94c54c32b1 Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5


Former-commit-id: bc3f196d48 [formerly 9927bac8ed [formerly 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021]]
Former-commit-id: 9927bac8ed
Former-commit-id: 1cce5ed9ef
2015-01-28 12:57:55 -06:00
Ana Rivera
ed61c52ee3 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40

Former-commit-id: 20ad0a65f3 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]
Former-commit-id: 8bfa7c4087
Former-commit-id: 4071b58b85
2015-01-27 22:05:59 +00:00
Ron Anderson
ef1afbaa0c Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a

Former-commit-id: 8a86832fb2 [formerly 5c08543da0 [formerly 99ae51d268e784461c0686a9d86d512049a501ac]]
Former-commit-id: 5c08543da0
Former-commit-id: a7ab638203
2015-01-27 13:43:44 -06:00
steve.naples
00b3fb4c42 ASM #283 - MPE GroupEditPrecipStns updated to fix issue with selecting gages when filtered out with Reverse Point slider.
Change-Id: I9743b37adfb8658d40458c00204ad87c50c10528

Former-commit-id: 0260da784d [formerly d960e4bba1 [formerly b10de7db401a9d4199c9eed98e41913a87b4b64a]]
Former-commit-id: d960e4bba1
Former-commit-id: 86b4054251
2015-01-27 18:36:49 +00:00
steve.naples
eedecf76d0 ASM #559 - Updated PostAnalysisManager and SummedHourlyMpeDlg to fix issue when opening PostAnalysis.
Change-Id: I9c2dcfd6af891b9ce0b60443a46e5cf9f3c7e99a

Former-commit-id: 565c4d69da [formerly 349ff47f53 [formerly fe5c51f43047d77202e6d5056d7d8be1736562bd]]
Former-commit-id: 349ff47f53
Former-commit-id: ffb1fbe0e6
2015-01-27 18:36:07 +00:00
Steve Harris
70b40e76fb Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
Former-commit-id: 82f2a146da [formerly 1891ed5e5b [formerly cfd0a31a17fc4a92af6db3f034d46b01996d2cc0]]
Former-commit-id: 1891ed5e5b
Former-commit-id: 0ac687b980
2015-01-27 11:34:06 -06:00
Fay.Liang
745ddd63c0 Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 7bc10075e5 [formerly d29d86ad05 [formerly 6ad30059fa7249aba100a39c7c39215212a929cc]]
Former-commit-id: d29d86ad05
Former-commit-id: 65d91d9113
2015-01-27 12:08:28 -05:00
Ana Rivera
dd232580d0 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18

Former-commit-id: 327945af8b [formerly 7c5fc26537 [formerly 889608360567b829f81ed6392c64c669798f34a9]]
Former-commit-id: 7c5fc26537
Former-commit-id: 62094315d2
2015-01-27 16:28:42 +00:00
Ana Rivera
7fede56575 Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
Former-commit-id: dee10b3f6f [formerly 171a38175c [formerly 6c72e1864ad5843c4ac42a558b589777af047c77]]
Former-commit-id: 171a38175c
Former-commit-id: f565ef4315
2015-01-26 19:04:54 +00:00
Ana Rivera
48cb3fd143 Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1

Former-commit-id: 7c25945fd9 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]
Former-commit-id: 98ac97e397
Former-commit-id: 654d08a588
2015-01-26 18:45:26 +00:00
Shawn.Hooper
ee48ce9e68 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e84a037b2e [formerly 568b7c801a [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]
Former-commit-id: 568b7c801a
Former-commit-id: e6c4f29036
2015-01-26 11:22:49 -05:00
Nate Jensen
6de7f4d2c8 Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient

Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802

Former-commit-id: c4598baf19 [formerly 63189329a1 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]
Former-commit-id: 63189329a1
Former-commit-id: 7e8d355f62
2015-01-26 09:10:36 -06:00
steve.naples
8d7fdfae67 ASM #17051 MPE: Daily QC will not display Points+Grids together.
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a

Former-commit-id: 540ea64498 [formerly 6488242165 [formerly 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3]]
Former-commit-id: 6488242165
Former-commit-id: 6811eb83a7
2015-01-23 20:40:48 +00:00
Nate Jensen
8d5b4d5eb9 Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f

Former-commit-id: 7c7c2e3a38 [formerly 415e2d4035 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]
Former-commit-id: 415e2d4035
Former-commit-id: dddc6c2cd4
2015-01-23 12:57:24 -06:00
Steve Harris
ea3465f55a Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec

Former-commit-id: 0f05c53a53 [formerly 158fa16376 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]
Former-commit-id: 158fa16376
Former-commit-id: 8cd9e2e92f
2015-01-23 09:08:06 -06:00
Ana Rivera
5cde6832a1 VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278

Former-commit-id: 44fa40c0cc [formerly 705f02f2be [formerly 653472d785f4af6fef8f2edd93c2e538806096ab]]
Former-commit-id: 705f02f2be
Former-commit-id: de1b989253
2015-01-23 14:21:22 +00:00
Mark Peters
e668bf77ff Omaha #3768 Add localization to build.properties
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30

Former-commit-id: 7a69f354d9 [formerly db69f5a0bc [formerly a6cafa7a07d33376cda3cc3a69437e45b6e0330f]]
Former-commit-id: db69f5a0bc
Former-commit-id: 30229a25f2
2015-01-22 18:05:40 -06:00
Shawn.Hooper
eefaa49d44 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: a757b55446 [formerly 0bc501bd4c [formerly d53c809149da23fcae51138cc45c57aecd641794]]
Former-commit-id: 0bc501bd4c
Former-commit-id: 7839dab5e6
2015-01-22 16:05:41 -05:00
Shawn.Hooper
6ce0645ce9 ASM #17054 - Disable MRMS Menu in 14.3.1
Change-Id: I071606c7c14ed0332b3c714a67cebab29bfc67f0

Former-commit-id: d0b7b06d97 [formerly bd5dfed072 [formerly 7f6638dd595b99d6592c58af42f898e0f1b2a02a]]
Former-commit-id: bd5dfed072
Former-commit-id: 9e83601505
2015-01-21 12:44:47 -05:00