Bryan Kowal
7a007960cf
Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
...
Former-commit-id: ee4b7c4ee858a2ae8bc898a310f4a7ee4b7c4ee858a2ae8bc898a310f4a76a197f845d98a310f4a76a197f845db2d4debdceac1b94c63f0fdfc0fd4ad1898937e0ec5f9c6623
2014-07-08 09:31:21 -05:00
Ben Steffensmeier
78a908ff88
Merge "Omaha #3356 remove common register buddies to uf.viz.core" into omaha_15.1.1
...
Former-commit-id: ea41558db53394a6230e3bbf29f639ea41558db53394a6230e3bbf29f6399eb9abd3f43bbf29f6399eb9abd3f4e71872c637fb17181baa956e9bb5b0eca19918dce859b8f822
2014-07-07 18:48:49 -05:00
Nate Jensen
26c73830fa
Omaha #3356 remove common register buddies to uf.viz.core
...
Change-Id: I8da0d7bb51c7aa3585c29ada43ba9d6470ec41e4
Former-commit-id: 356a23ce9457635e6f3f5148898b23356a23ce9457635e6f3f5148898b23886aee2bf95148898b23886aee2bf903c2a288a6aad51b7f112a55f0db4eac8e3f3fd5d0399c82b8
2014-07-07 17:32:37 -05:00
Brian Clements
a34aaf537a
Omaha #3333 removed redundant field from viz lightning
...
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: 392b640b4791b136c2a0572d95e78a392b640b4791b136c2a0572d95e78ae4795f6a13572d95e78ae4795f6a132d1fb0d3ab9afb344828e1d5d86d29b2a4b1da71f3735af783
2014-07-07 15:13:28 -05:00
Brian Clements
175c675ac9
Omaha #1255 fixed collaboration colors
...
config.xml was not in build.properties
provided a fallback default if config is missing
Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6
Former-commit-id: c024dd86a1aeb093ad950d4cd4bab8c024dd86a1aeb093ad950d4cd4bab8da53d9ccc70d4cd4bab8da53d9ccc755c2c91ec92cea766aede6e84d2c719a1bc8c5212bebd393d8
2014-07-07 12:29:12 -05:00
Richard Peter
4c1f802f39
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
...
Former-commit-id: 1dca75e12d4219dbeec8ba1bd204071dca75e12d4219dbeec8ba1bd204078c17e9cef2ba1bd204078c17e9cef295aad91ab13e19911306741fc59f34b4e4629d241399f0cd57
2014-07-07 09:39:28 -05:00
Richard Peter
fe1e6d235e
Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
...
Former-commit-id: c2deb63b764312c9c56942ec8874c8c2deb63b764312c9c56942ec8874c806a1d1555c42ec8874c806a1d1555c8d8ff4bbfed27ebb1175804e9d1035b97f69355448d293abd6
2014-07-07 09:30:09 -05:00
Richard Peter
db19da8804
Merge "Omaha #3350 Removing OBE classes/files for registry user registry and identity management" into omaha_14.4.1
...
Former-commit-id: 16e6f932858a5608d851a50a5b166316e6f932858a5608d851a50a5b166398d82de231a50a5b166398d82de231eca055364ce57ce89b6bce245ac8cf72f61418a35d650dcab2
2014-07-07 09:21:02 -05:00
Ron Anderson
22e3cf10db
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
...
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: 56389537c2fd16321f828d50f9d15a56389537c2fd16321f828d50f9d15a24faa482338d50f9d15a24faa48233d258c29189ae401db2ab87664d86a59a873532ad6935f82cfa
2014-07-07 09:02:14 -05:00
Roger Ferrel
910ac7107d
Omaha #3348 Handle Enter event on Open's tree and text field.
...
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4
Former-commit-id: 045cd846ec1964c7c4f76305bfdcb6045cd846ec1964c7c4f76305bfdcb6f064f0d1026305bfdcb6f064f0d102eee0c50e5374f5c7eb827649930247da45f3e5e20554d1834c
2014-07-07 08:52:50 -05:00
Steve Harris
5aaf5bf454
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: dcab227f00e7de4b71309886a6aa5fdcab227f00e7de4b71309886a6aa5f77259e5c189886a6aa5f77259e5c181ddd3ce18e7071f50293853d8035279ef301c4b36aa24992e2
2014-07-07 08:35:33 -05:00
Brian Clements
42250dbe29
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: aad63c257dc3a25024aebfd9f59de8aad63c257dc3a25024aebfd9f59de8e4c9a13adbbfd9f59de8e4c9a13adbb5c495114450d2c6e24cbd9520f4fe276dd801f255bcd816ff
2014-07-03 15:11:48 -05:00
Benjamin Phillippe
ae9889f289
Omaha #3350 Removing OBE classes/files for registry user registry and identity management
...
Former-commit-id: 804a11f0f5c6c2f9240eba0472caad804a11f0f5c6c2f9240eba0472caad7960578e2cba0472caad7960578e2ced4acc088e600a6c245a29f98ed5abeaf031c3dd9058a06b0e
2014-07-03 12:53:22 -05:00
Nate Jensen
b09ed48c43
Omaha #3165 fix grib logging imports
...
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021
Former-commit-id: 76850794d6e101d99ba2bd46c4324076850794d6e101d99ba2bd46c43240063ccb25e6bd46c43240063ccb25e6b5518c4d404cb1e42ddb4dc36437fa998c6e42535a7e3697e4
2014-07-03 11:07:41 -05:00
Bryan Kowal
b16772d584
Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
...
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.
Former-commit-id: fb397099e0d0d5a0805738d2431518fb397099e0d0d5a0805738d2431518a83301c1e938d2431518a83301c1e983e3155ff9712ee6ea96fa496a44f68c2556649b171785fb9e
2014-07-02 15:58:50 -05:00
Roger Ferrel
79f087b47e
Omaha #3318 Changes to add GEFS to volumen browser.
...
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: b56fe77cbf2723c9216702d9609862b56fe77cbf2723c9216702d96098621869745cce02d96098621869745ccee39f121e2f37c05adfaf7f50b8fb93a7daeebc77862a065051
2014-07-02 14:27:28 -05:00
Brian Clements
0a5aa48230
Omaha #3245 caveUtil.sh handle memory overide in vm args
...
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 92be869624fdec99abc5013292ce9d92be869624fdec99abc5013292ce9d2773cf8935013292ce9d2773cf8935fff99d35ee767d8abd20648ffac1466dea5ec026c502009375
2014-07-02 14:20:10 -05:00
Richard Peter
605f3eb2e2
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
...
Former-commit-id: 1c07ac97d19c41b7c23e59325cf1f11c07ac97d19c41b7c23e59325cf1f127ba90594759325cf1f127ba9059472bcaeba573a22847695d127ce13eb8a357fc835b6710269555
2014-07-02 11:51:26 -05:00
Nate Jensen
22149e3ccc
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
...
Former-commit-id: 0031f7adf5e193fe4719324194117a0031f7adf5e193fe4719324194117a14b514df2c324194117a14b514df2c7f89f61ab6be426fc965f39f6858e2760adb2b7754a1daffc6
2014-07-02 11:20:26 -05:00
Nate Jensen
a80e3727ab
Omaha #3165 build viz.useradmin before viz.datadelivery
...
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: a38a776ac615d6ff7f79f6cbccdc5ca38a776ac615d6ff7f79f6cbccdc5c74e2bd1670f6cbccdc5c74e2bd1670480b5b5863db24013aa6e9b31a4429db9550e367f4540db824
2014-07-02 11:18:59 -05:00
Brian Clements
67ae3d92ac
Omaha #1255 added collaboration specific color presets
...
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 6c381d53ed08724fefd78b5ad1ec336c381d53ed08724fefd78b5ad1ec33eac871eed78b5ad1ec33eac871eed72d1a994bfcea1ac8ee8fcd282ef018d066846c3f2cd0d94e5d
2014-07-02 10:02:52 -05:00
Nate Jensen
2d6a340288
Omaha #3165 attempt to fix build
...
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 6f28f24afa1373af3e55a93af621d86f28f24afa1373af3e55a93af621d8765ac1258ba93af621d8765ac1258bb31f618153bbd50040a5264ac4d8a3d1d3aa94a6ef967d42e3
2014-07-02 10:01:05 -05:00
Nate Jensen
a3949b4437
Omaha #3165 separate registry plugins for viz to support hazard services
...
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: d873599954a16d8689e9f10efa300cd873599954a16d8689e9f10efa300cf32bf19eb7f10efa300cf32bf19eb7bdb4d8e102ec64800f2855dcecc7a7e659a0702d8c99b38625
2014-07-01 17:37:08 -05:00
Richard Peter
94d32f19ff
Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
...
Former-commit-id: 03290f682e57ec1df5a5b8f2fddd9503290f682e57ec1df5a5b8f2fddd958dfa9696afb8f2fddd958dfa9696af01991dac3a93ef55e65ed8687baba7b7db53b9215e343e9cf4
2014-07-01 16:03:36 -05:00
Richard Peter
c2982c843b
Omaha 3300 Fix merge issue in gfe-spring.xml
...
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea
Former-commit-id: 003689101cb38dd722be40c01d05d4003689101cb38dd722be40c01d05d4eacaf068a740c01d05d4eacaf068a7e5d6a4f4217961742ee6a4beeb4d1b5b0667e61f0ccb573e31
2014-07-01 15:43:46 -05:00
Richard Peter
0b0b58e89c
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: ed38bf23726636b301e593bbd98cbced38bf23726636b301e593bbd98cbc8ecc27f71493bbd98cbc8ecc27f714948e0cd011552ac6d640fc27824dbc0fefdc7cd6342192e967
2014-07-01 15:34:39 -05:00
Roger Ferrel
becbc1f6e3
Omaha #3230 Recursive search for model files.
...
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49
Former-commit-id: 3c2a477f4669fab4d289cd3720035d3c2a477f4669fab4d289cd3720035da8c93f7783cd3720035da8c93f77830b96193de4bb6e08ae2ff7fe138cc184fcb66cd0481617bff0
2014-07-01 15:33:30 -05:00
Steve Harris
7408b3e09d
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
...
Former-commit-id: 6a7aeb3557f68e0519381c8dc56d496a7aeb3557f68e0519381c8dc56d4930cdbff7f81c8dc56d4930cdbff7f83369bc4a1da4d91c59d66f9129ac78d600ed9acf15267970e4
2014-07-01 13:38:18 -05:00
Nate Jensen
eee4a69f11
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
...
Former-commit-id: 71025bcc3d81ca7a9e9fc0d36e9a6971025bcc3d81ca7a9e9fc0d36e9a691183c0538ec0d36e9a691183c0538e886348da0852d5edac63cb9e715aec10dee290297d03309e18
2014-07-01 10:30:54 -05:00
Nate Jensen
c790f68d66
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
...
Former-commit-id: 479b22f6a1ac0f0e22980a9fc691b9479b22f6a1ac0f0e22980a9fc691b9fbda7c44890a9fc691b9fbda7c4489d1ce9eed5bfe1f9e89779e6433f44b6f0d00711273bdd3a339
2014-07-01 10:22:25 -05:00
Greg Armendariz
0121d94f03
Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
...
Former-commit-id: 80fd17a8c2134f0e2e8b82fe8608e080fd17a8c2134f0e2e8b82fe8608e00688e9db1b82fe8608e00688e9db1b0cf0691534471814e891fa76c0c1df36252d33b2900bd92331
2014-07-01 10:17:11 -05:00
Nate Jensen
3f825c4392
Merge "Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range." into omaha_14.4.1
...
Former-commit-id: 049450c5a93b2dc2915e35e3626527049450c5a93b2dc2915e35e36265271d2ae81ff635e36265271d2ae81ff685cc42e2ea14d368f33b8a03a5ecb9c0096b05705ed2cdc4ec
2014-07-01 10:12:14 -05:00
Steve Harris
1bbbdc9c62
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 741dc31fcb2f2958df37d4dc1723c1741dc31fcb2f2958df37d4dc1723c17acd9ab2ddd4dc1723c17acd9ab2ddd70da4127e7fb4663d75dcbab5621f71357da9d28fb747ad27
2014-07-01 11:08:46 -04:00
Richard Peter
76d59a8839
Merge "Omaha #3255 Updated Proxy classes to include all java proxy config settings" into omaha_14.4.1
...
Former-commit-id: a15a86a911838739ebbb027fff1de0a15a86a911838739ebbb027fff1de0e7d0dd1e28027fff1de0e7d0dd1e284a4439d2fdd0ce3374a70cef25a49ca936bb8c7c2bf09c794f
2014-07-01 10:02:57 -05:00
Richard Peter
ffe546f816
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
...
Former-commit-id: 102403542220eeb493bb6d9db0784a102403542220eeb493bb6d9db0784ae6ac1b2ec86d9db0784ae6ac1b2ec817839c25142965150f363de8492ff3e659b5a6948c2a97eb67
2014-07-01 09:48:20 -05:00
Nathan Bowler
7fcdbd8b20
Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range.
...
Change-Id: I63681d5172689711834f3d71df9424c68a1f5317
Former-commit-id: 7908a8a361f3fc00fb3243f164e6827908a8a361f3fc00fb3243f164e682609981527243f164e682609981527290bbbda6a1f667260f7c175f879042047fc6ec88d54fa442d8
2014-07-01 09:19:15 -04:00
Nate Jensen
ee9c8b0fb9
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
...
Former-commit-id: 0080d9765503efa73bd763bc6ed3720080d9765503efa73bd763bc6ed372fb84c9455263bc6ed372fb84c94552d4b265fcca7314f9c2f101115d0ad0a2ab4f6c7694cd22b009
2014-06-30 16:21:09 -05:00
Benjamin Phillippe
19c30949ec
Omaha #3255 Updated Proxy classes to include all java proxy config settings
...
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79
Former-commit-id: 2075f59d5815b1fb71dd36ef9e7a1a2075f59d5815b1fb71dd36ef9e7a1a0dd626286236ef9e7a1a0dd626286284c19814922a294fcfce3a90b09dbff6866108023abde21053
2014-06-30 16:00:58 -05:00
Brian Clements
9f8aea91aa
Omaha #1798 fixed collaboration drawing issues when leader shares new map
...
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer
Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa
Former-commit-id: 309900daab0125117d9c88ba6b47ad309900daab0125117d9c88ba6b47adfc70dbc86e88ba6b47adfc70dbc86e7ffa3c80c1b186894f3244f8b3dce10be4260b4cbe0185379b
2014-06-30 15:57:58 -05:00
Nate Jensen
be7402f054
Omaha #3245 fix detection of correct ini file
...
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: e9ffe3f2d6d72b56b988bca39f8b39e9ffe3f2d6d72b56b988bca39f8b3948249301fcbca39f8b3948249301fc4dd144d8730f0e890fce1d6912b4dd635e902b80d189ad3b7a
2014-06-30 15:53:41 -05:00
Greg Armendariz
c3bc9d54a0
Omaha #3299 - Remove project file and change build reference
...
Former-commit-id: c8dcf22c4020f5ccf9f0f4063c8162c8dcf22c4020f5ccf9f0f4063c816240ad6795dff4063c816240ad6795df4829515d8b68846930ee44b448738cd26bb8e2c2941bc791a9
2014-06-30 14:49:24 -05:00
Nate Jensen
7f5285bf96
Omaha #3165 remove deprecated buildColorMap()
...
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: b7c6ab2386a393ad429a766d3323d3b7c6ab2386a393ad429a766d3323d3128950ec19766d3323d3128950ec19c8d32368ee4ac06c06ee2bf3449e00345de597a625b2c1fa3e
2014-06-30 13:22:57 -05:00
Lee Venable
c65c39934d
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
...
Former-commit-id: b3f009902902037fc2df588d3084dab3f009902902037fc2df588d3084da07a7a00256588d3084da07a7a002564f413032e3e5f1eaf67dc6e53f6a9b6046a2cbe144f67ce5ad
2014-06-30 13:15:31 -05:00
Nate Jensen
daa232b3d2
Merge "Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory" into omaha_14.4.1
...
Former-commit-id: ab51c67540fff613478c098322ded4ab51c67540fff613478c098322ded4daacd735e7098322ded4daacd735e7a2e5cd6ac7e98a95687b8a274be75fb0daf485babb71f188a2
2014-06-30 12:04:21 -05:00
Nate Jensen
8771aee35d
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
...
Former-commit-id: 914683e8a51137ef84fd9fddc57142914683e8a51137ef84fd9fddc57142fdddf1e0969fddc57142fdddf1e096108be98832cc66308aaa1ac5c54ee3c6c921279a29a41f81c2
2014-06-30 12:03:21 -05:00
Nate Jensen
887fb84cde
Merge "Omaha #2760 Made external JMS route for registry events Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6" into omaha_14.4.1
...
Former-commit-id: 19a634f97c5577128de2ef92f03f0619a634f97c5577128de2ef92f03f06d6008fc401ef92f03f06d6008fc40153ba2a3e010bb74e39004f0160d98a58a5daa450b44c1dae06
2014-06-30 11:04:55 -05:00
Slav Korolev
896b7c59d1
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
...
Former-commit-id: 64e9564de0cd740de2981b870e21fc64e9564de0cd740de2981b870e21fc1956077e1a1b870e21fc1956077e1a3e4c08d4efe8811128fc0f5a2c0233a78f0ea7655395df01c9
2014-06-30 09:40:32 -04:00
Richard Peter
c2835d25ac
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
...
Former-commit-id: 5a74a3cf99bcffac8875706409b4595a74a3cf99bcffac8875706409b459f4cdd661fe706409b459f4cdd661fe570bf42f89b94dc3b045e3c3d5588325dd598b5550fdb66cb4
2014-06-27 16:52:39 -05:00
Richard Peter
e6ee020f9d
Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
...
Former-commit-id: 90dd05664dcfdb8eebfc48aceec34890dd05664dcfdb8eebfc48aceec348cfb9e6d0ad48aceec348cfb9e6d0adbc43fa3722d15be4d4a1b1810026c88b8f6ff0fe3847155429
2014-06-27 16:51:36 -05:00
Brian Clements
e25a446dae
Omaha #3323 fixed collaboration disposed font issue
...
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: c2cd991296023d1bde0bdc7a76197dc2cd991296023d1bde0bdc7a76197dfe149faffadc7a76197dfe149faffa6bae8b556cb8dc75d192cb108f12b80800ea7cb7ac986ca600
2014-06-27 16:33:27 -05:00
