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

864 commits

Author SHA1 Message Date
mjames-upc
3a5ea20be9 Refactored HyperSelector to numpy.ndarray for h5py 2.6.0, refactored PointSelector to use _hl.selections 
Former-commit-id: 50bbcdfb58
 2016-03-18 18:29:54 -06:00
mjames-upc
681f1a1586 don't use that symlink damnit 
Former-commit-id: 88a0dd17de
 2016-03-17 16:19:27 -05:00
mjames-upc
7e3c4fc204 symlink pythonPackages/python-awips 
Former-commit-id: c62d76c081
 2016-03-17 16:12:32 -05:00
mjames-upc
8930e12dec ufpy->python-awips; no longer building thrift or dynamicserialize RPMs 
Former-commit-id: d0068c97dd
 2016-03-16 18:51:24 -05:00
mjames-upc
ba0d75e104 remote: error: File pythonPackages/basemap/basemap-1.0.7.tar.gz is 123.69 MB; this exceeds GitHub's file size limit of 100.00 MB 
Former-commit-id: 44e16f1a81cc51dc766a1060c1f1ed8a6aac969f [formerly 832ed6800c32750fd12a2a3dd10a68bbb63d0a1d]
Former-commit-id: 81270442eb
 2016-03-15 11:00:56 -05:00
mjames-upc
0e9cf73b41 metpy 0.3.0, numpy 1.10, cartopy 0.13.0, basemap 1.0.7 
Former-commit-id: 5daf25b08c4475c75347a66ce60e7b39712fd22c [formerly ff60eb3a7be83e96a595c2868243f45bfc6203f8]
Former-commit-id: 076392d3de
 2016-03-13 18:05:31 -05:00
mjames-upc
8b9529075e Merge branch 'unidata_15.1.1' of github.com:Unidata/awips2 into unidata_15.1.1 
Former-commit-id: 3018131470
 2016-03-09 12:27:38 -07:00
mjames-upc
c8b157eb46 grid naming updates 
Former-commit-id: ee4d47a486
 2016-03-09 12:26:50 -07:00
mjames-upc
0791f234e1 cython 0.23.4 and dateutil 2.5.0 
Former-commit-id: bfadb4fd78
 2016-03-03 18:51:38 -06:00
mjames-upc
a923199aad pint 0.7.2 and six 1.10.0 
Former-commit-id: 7dbbe402bc
 2016-03-03 18:39:49 -06:00
mjames-upc
ca7f095f96 numpy 1.5.0->1.7.2 
Former-commit-id: 1111897505
 2016-01-02 10:45:37 -07:00
mjames-upc
3a59fefb09 cleaning up unidata_15.1.1 enough to launch in eclipse 
Former-commit-id: 0b01029e68
 2015-12-29 20:15:31 -07:00
mjames-upc
d209a21308 data_store should always be defined as /awips2/data_store/ - round 2 
Former-commit-id: c6cfc1ea22
Former-commit-id: 490e8d593d
 2015-10-27 14:08:20 -06:00
mjames-upc
38f5175af9 various: dcgunzip, qpid-python-0.32 src, build increment 
Former-commit-id: 472aeeca1a
Former-commit-id: d205400d77
 2015-09-08 18:01:20 -06:00
mjames-upc
194adffea5 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n 
Former-commit-id: f25e918e50
Former-commit-id: c921ec69d6
 2015-09-03 15:48:53 -06:00
mjames-upc
f646bbe981 renamed again 
Former-commit-id: dbeae07821196e8e20e6f9d62e3769189fdb54fe [formerly 45a405263c2e65d869fbd0a57843adf34aa87044] [formerly 99649e5a3a [formerly 7dee974512]]
Former-commit-id: 99649e5a3a
Former-commit-id: 03b89a7ba0
 2015-08-24 12:00:37 -06:00
mjames-upc
f36bde7795 remove newer scipy dir 
Former-commit-id: cf5e73888ce42fb15a1858d142499ad5bc207035 [formerly 2812a04dbc09bfa01121082b8fe7e9e977261bb9] [formerly c04d92b25a [formerly 82b9d06051]]
Former-commit-id: c04d92b25a
Former-commit-id: 316f21b41f
 2015-08-24 11:59:55 -06:00
mjames-upc
05cd919443 this bullshit 
Former-commit-id: 16913f04d6e016947013271be1310f0e8e0ca65a [formerly 719dc0c1c280de71e23f2077dc4bbe48bbfa0137] [formerly 67ef79465d [formerly ecbb9f8f14]]
Former-commit-id: 67ef79465d
Former-commit-id: a725e61d1d
 2015-08-24 11:57:50 -06:00
mjames-upc
30d98ab447 scipy cleanup 
Former-commit-id: 0ae519b0e6bfd869d30d2b99142bd55a1e114bd8 [formerly 8dfd0d55f9461fef5ed31ee85608c4b34f06c674] [formerly dc447b8c2b [formerly f0b0f2adf1]]
Former-commit-id: dc447b8c2b
Former-commit-id: 04b357c543
 2015-08-24 11:40:31 -06:00
mjames-upc
ed34e61114 scipy directory renaming 
Former-commit-id: c92db690a5feb77ed20b4beaf3a7d3aa8594485a [formerly 6e62283cfdcf388092839812050a855fb637f802] [formerly c236dc57f4 [formerly 40b4395465]]
Former-commit-id: c236dc57f4
Former-commit-id: 20ece6ac4a
 2015-08-24 11:39:59 -06:00
mjames-upc
0a06152d79 rollback for scipy 
Former-commit-id: c394e7746941acfd4520108d1c61027ebdc4d28a [formerly ad97f17ce5e05f7fb3f95bb2b589bf73cea87d46] [formerly 23cbfaf5b7 [formerly 5d7e8d3b70]]
Former-commit-id: 23cbfaf5b7
Former-commit-id: 839f13cb21
 2015-08-24 11:39:04 -06:00
mjames-upc
41af3ff929 pyparsing 2.0.1 and six 1.9.0 
Former-commit-id: 5444287845520e7b358b18a38006ad5ccc4e2658 [formerly ca15bbcb1ed28f29b85b92d615a85380f76592a1] [formerly 755e8a07fb [formerly b77e15ce03]]
Former-commit-id: 755e8a07fb
Former-commit-id: f0d18c7ab3
 2015-08-06 15:42:35 -06:00
mjames-upc
ae64131acb pyparsing 2.0.1 and six 1.9.0 
Former-commit-id: 41af3ff929 [formerly f0d18c7ab3] [formerly 755e8a07fb] [formerly 5444287845520e7b358b18a38006ad5ccc4e2658 [formerly ca15bbcb1ed28f29b85b92d615a85380f76592a1] [formerly 755e8a07fb [formerly b77e15ce03]]]
Former-commit-id: a7ba29154108d4f7fe6dcda0376b81b4e4e1f09c [formerly 180be5b97744ee2d870096c51fded0039d3f6586] [formerly abc63d2f3e [formerly d4efcc78c3]]
Former-commit-id: abc63d2f3e
Former-commit-id: a5fb033fa7
 2015-08-06 15:42:35 -06:00
AWIPS User
c19d6097fd default DAF server to locally resolved edex 
Former-commit-id: d9e12806936cb1df999c9b04b1dcb472c375e9eb [formerly bb1c584239f1574b7f2a93dd004b8d0f50af8148] [formerly 0b35183a8f [formerly 07b8d03d55]]
Former-commit-id: 0b35183a8f
Former-commit-id: a365e8d8b8
 2015-08-02 10:32:35 -06:00
AWIPS User
384654af36 default DAF server to locally resolved edex 
Former-commit-id: c19d6097fd [formerly a365e8d8b8] [formerly 0b35183a8f] [formerly d9e12806936cb1df999c9b04b1dcb472c375e9eb [formerly bb1c584239f1574b7f2a93dd004b8d0f50af8148] [formerly 0b35183a8f [formerly 07b8d03d55]]]
Former-commit-id: 2ab04e1c082f2c472cae87e0d2e2cce29b774bc9 [formerly e706dadf482b008ef8531f5e21cecaa98bae90a0] [formerly 3d1a467d1c [formerly 4aa7e4aefe]]
Former-commit-id: 3d1a467d1c
Former-commit-id: 2dfff8b524
 2015-08-02 10:32:35 -06:00
AWIPS User
56c8bae35c updated numpy, scipy, matplotlib. added cython, metpy, python-dateutil, six, pint. 
Former-commit-id: e43e9c46798acf751773c9812203649fce1d15a9 [formerly fa5e33604b6a832bb5b5d4d082a26d8d68e690ad] [formerly 829afc3e85 [formerly 2982d68160]]
Former-commit-id: 829afc3e85
Former-commit-id: fee97d57cc
 2015-08-02 10:31:57 -06:00
AWIPS User
bb30fa4592 updated numpy, scipy, matplotlib. added cython, metpy, python-dateutil, six, pint. 
Former-commit-id: 56c8bae35c [formerly fee97d57cc] [formerly 829afc3e85] [formerly e43e9c46798acf751773c9812203649fce1d15a9 [formerly fa5e33604b6a832bb5b5d4d082a26d8d68e690ad] [formerly 829afc3e85 [formerly 2982d68160]]]
Former-commit-id: 7a05255ce4cca65778fdf3def19f880160d182cb [formerly c2259e888b996bcc79c7e8d23f2752e578886af2] [formerly ab36035399 [formerly 28f92948a0]]
Former-commit-id: e963fd95fbf5e5c9aab2cde83571d27af2727652 [formerly ab36035399]
Former-commit-id: 1f2c7dd237
 2015-08-02 10:31:57 -06:00
AWIPS User
f9771032c4 numpy->1.9.2, cython 0.22.1 added for rpm build 
Former-commit-id: c1dbbbe04b6f31d99c4cd746fc37e36ea27f757e [formerly 421b0e5856091c2f61feae3bc3256c2babd65e16] [formerly f89120af6b [formerly 53c4a138c9]]
Former-commit-id: f89120af6b
Former-commit-id: 811013d84e
 2015-08-01 16:06:25 -06:00
AWIPS User
228eb98d09 numpy->1.9.2, cython 0.22.1 added for rpm build 
Former-commit-id: f9771032c4 [formerly 811013d84e] [formerly f89120af6b] [formerly c1dbbbe04b6f31d99c4cd746fc37e36ea27f757e [formerly 421b0e5856091c2f61feae3bc3256c2babd65e16] [formerly f89120af6b [formerly 53c4a138c9]]]
Former-commit-id: 4880bccf838e8475120d800a02b9c9d143708372 [formerly 93a640569c67ea160ec8c819278fded601201964] [formerly 1746b74950 [formerly e6133124ac]]
Former-commit-id: 1746b74950
Former-commit-id: 78f6ab7ba1
 2015-08-01 16:06:25 -06:00
Ron Anderson
6e9ae11d96 Omaha #4522 Fix dynamic serialization errors 
Change-Id: I73c96d05d1381509b44b3bcd99907369da3e3259

Former-commit-id: dbe85e19f2 [formerly 5d1ed08cb86930a3d0bfe16aacef215bf9a6004a]
Former-commit-id: 57aacebeda
 2015-06-04 18:08:53 -05:00
Ron Anderson
cda6d5fe5d Omaha #4027 Changes to match draft mixed case guidelines from Phase I 
Change-Id: I2af2a2742f99c8a97976cafd451057b7e7137efe

Former-commit-id: 163ddea34e [formerly b9d9063e56939b558eee3f64b65ddc28f6478c38]
Former-commit-id: 2304e45d74
 2015-05-14 14:58:07 -05:00
Ron Anderson
1d4fe94e1f Omaha #4027 Get GFE Formatter auto tests working with mixed case 
Change-Id: I55c2b34adca1c049116682be5ff40509729e16c0

Former-commit-id: 6adb5f6dbc [formerly c214e6cc22140b53ac8bd5514913b63a0850867a]
Former-commit-id: 38b8082aac
 2015-05-07 14:41:49 -05:00
Ron Anderson
ba2ee4790c Omaha #4027 More changes for Mixed Case 
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e

Former-commit-id: 551d1bee91 [formerly 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e]
Former-commit-id: 6b3a0d1478
 2015-04-29 13:18:27 -05:00
Steve Harris
663bf8c2f9 Merge tag 'OB_14.4.1-20m' into omaha_15.1.1 
14.4.1-20m

 Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 165971a4f6 [formerly 0db97a3cefc6f709d336883202e51f1d5255ad75]
Former-commit-id: 25bd3ee930
 2015-03-26 09:57:17 -05:00
David Gillingham
6323dea0be Omaha #4103: Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status. 
NOTE: Service Backup features are broken until DR 4300 lands on this branch.

Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f

Former-commit-id: a4d13dbabd [formerly 732208b6600882a9ba9fcc0eefd7c8be0157beab]
Former-commit-id: fd5b270fdd
 2015-03-19 16:13:56 -05:00
Fay.Liang
8db78cb400 Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 3233640aa2 [formerly 42d435f739134ec29a021415ed96b6c3406fc021]
Former-commit-id: 6f8f2f5398
 2015-03-18 14:54:46 -04:00
Steve Harris
afeba20b57 Merge tag 'OB_14.4.1-18m' into omaha_14.4.1 
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java


Former-commit-id: 9b749e134d [formerly bda107f32a [formerly 19f99823a6] [formerly 9b749e134d [formerly 390c7ec5c261717f6e0b2053761e12e1fcb68215]]]
Former-commit-id: bda107f32a [formerly 19f99823a6]
Former-commit-id: bda107f32a
Former-commit-id: fdf751fa90
 2015-03-18 13:09:03 -05:00
Steve Harris
31a6aa8107 Merge tag 'OB_14.4.1-18m' into omaha_15.1.1 
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 67b3a77c4f [formerly 41217304fa68101d17e003b2fa6992d0e15b083c]
Former-commit-id: 2fd5ba420f
 2015-03-18 09:29:01 -05:00
Nate Jensen
191681a413 Omaha #4269 fix pypies logging process that was broken due to python 
2.7.4 'fix' of http://bugs.python.org/issue14436

Change-Id: I496c1612eca0450f925ae0cd78dca9f28cd89d79

Former-commit-id: 8f19a358a8 [formerly dae442d1f32fa5f5c9547ab1932134e3865557d1]
Former-commit-id: 20eb88b23a
 2015-03-11 16:29:17 -05:00
Nate Jensen
2cb47ca540 Omaha #4269 fix pypies logging process that was broken due to python 
2.7.4 'fix' of http://bugs.python.org/issue14436

Change-Id: I496c1612eca0450f925ae0cd78dca9f28cd89d79

Former-commit-id: 8f19a358a8 [formerly 191681a413 [formerly 20eb88b23a] [formerly 8f19a358a8 [formerly dae442d1f32fa5f5c9547ab1932134e3865557d1]]]
Former-commit-id: 191681a413 [formerly 20eb88b23a]
Former-commit-id: 191681a413
Former-commit-id: b44803863d
 2015-03-11 16:29:17 -05:00
Fay.Liang
a9945f1981 Merge tag 'OB_14.3.2-19m' into master_14.4.1 
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 0e475cb704 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]
Former-commit-id: 059eb032b1
 2015-03-09 16:11:13 -04:00
Fay.Liang
55e0d315e7 Merge tag 'OB_14.3.2-19m' into master_14.4.1 
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 0e475cb704 [formerly a9945f1981 [formerly 059eb032b1] [formerly 0e475cb704 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]]
Former-commit-id: a9945f1981 [formerly 059eb032b1]
Former-commit-id: a9945f1981
Former-commit-id: 1138f48ee9
 2015-03-09 16:11:13 -04:00
Nathan Bowler
0af7bfb414 Omaha #4174 Output full stacktrace 
Change-Id: Icf84265ea77aaa4438f192014f7d1d8ef87a2bb2

Former-commit-id: db31f34257 [formerly 077d6a987d0f37cfd18cbe2ed353a3826f449699]
Former-commit-id: 96bee79c06
 2015-02-27 10:50:10 -05:00
David Gillingham
632a6905a1 Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py. 
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: 8c0a035702 [formerly dfbfd38194c88c70f3e75de06bfc7114c6bd3542]
Former-commit-id: 1e86f4cb13
 2015-02-18 13:07:56 -06:00
David Gillingham
0737ad28a3 Issue #4144: Fix python version SendPracticeProductRequest and VTECDecoder.py. 
Change-Id: I1f85fc5d92034200014cfe464b51f4f2d8ae9080

Former-commit-id: 8c0a035702 [formerly 632a6905a1 [formerly 1e86f4cb13] [formerly 8c0a035702 [formerly dfbfd38194c88c70f3e75de06bfc7114c6bd3542]]]
Former-commit-id: 632a6905a1 [formerly 1e86f4cb13]
Former-commit-id: 632a6905a1
Former-commit-id: fb4cb8e67b
 2015-02-18 13:07:56 -06:00
David Gillingham
393514af31 Omaha #4072: Remove uf.common.dataplugin.grib modules from pythonPackages project. 
Change-Id: Ibb512ca3d8c1f1ef83e51e70a70b6fba67b90922

Former-commit-id: e3430ff7d5 [formerly 89a108e98c148429f574dae2abe4f5c5beacc323]
Former-commit-id: f743cba5a8
 2015-02-09 13:07:39 -06:00
Steve Harris
16b0574adc Merge tag 'OB_14.4.1-4m' into omaha_15.1.1 
Conflicts:
	cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java

Former-commit-id: 8eb10d0456 [formerly 714ca199f27013313099920bb9f55009c794f7f8]
Former-commit-id: 716879f58b
 2015-01-27 11:56:24 -06:00
Greg Armendariz
c0b3980ebc Omaha #3777 - Update numpy 
Former-commit-id: 0ebaf6c5eb [formerly cb63272b0eab1ea78230326da1733b0d55e3da9a]
Former-commit-id: 153897c19f
 2015-01-26 09:54:56 -06:00
Nathan Bowler
f7acda4f6a Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance. 
Change-Id: I168bd135ae3ddd386761bb87b9160eb97f718642

Former-commit-id: a674630b92 [formerly 6f9709b43d307494dfa702030b961964ec8d2170]
Former-commit-id: 863ac95fef
 2014-12-19 12:56:43 -05:00
Nathan Bowler
21738c7a82 Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance. 
Change-Id: I168bd135ae3ddd386761bb87b9160eb97f718642

Former-commit-id: 9b1b57ca13 [formerly 1f4c329495] [formerly f7acda4f6a] [formerly f7acda4f6a [formerly 863ac95fef]] [formerly a674630b92 [formerly f7acda4f6a [formerly 863ac95fef] [formerly a674630b92 [formerly 6f9709b43d307494dfa702030b961964ec8d2170]]]]
Former-commit-id: a674630b92
Former-commit-id: 11e658454d05dfb254cfaabf29e19926c528f7f3 [formerly 27d5c1578378a059fb3484843a5cfb91f8286d9c] [formerly 1548a93675 [formerly c7805340b5]]
Former-commit-id: 1548a93675
Former-commit-id: a06f1ff4d8
 2014-12-19 12:56:43 -05:00