Nate Jensen
|
21d3d905b1
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: 2baedbf6b8 [formerly 56363ffc4a] [formerly c003d70168] [formerly 2baedbf6b8 [formerly 56363ffc4a] [formerly c003d70168] [formerly 939fde1575 [formerly c003d70168 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]]]
Former-commit-id: 939fde1575
Former-commit-id: 25379a63f6 [formerly c421e2de75] [formerly 3c068152fc5db062515196cd9a0c4241b85b8f92 [formerly a2cfcd8716]]
Former-commit-id: f92a2a465f2193ba867848c40d1d3ca215e457ba [formerly 75ffabbcc2]
Former-commit-id: b54a9694ee
|
2014-07-02 09:24:15 -05:00 |
|
Nate Jensen
|
a3949b4437
|
Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: d873599954 [formerly a16d8689e9] [formerly f10efa300c] [formerly d873599954 [formerly a16d8689e9] [formerly f10efa300c] [formerly f32bf19eb7 [formerly f10efa300c [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]]
Former-commit-id: f32bf19eb7
Former-commit-id: bdb4d8e102 [formerly ec64800f28] [formerly 698bed9b285b34465367799322f3d30195e6be16 [formerly 55dcecc7a7]]
Former-commit-id: 0b197806e0b2ceee741054932d4a8acc506b8f4d [formerly e659a0702d]
Former-commit-id: 8c99b38625
|
2014-07-01 17:37:08 -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: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
7408b3e09d
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 6a7aeb3557 [formerly f68e051938] [formerly 1c8dc56d49] [formerly 6a7aeb3557 [formerly f68e051938] [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 1c8dc56d49 [formerly 382c772c196711d230395f34a04559c188880622]]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: 3369bc4a1d [formerly a4d91c59d6] [formerly f86265bab0c346864e940cc8c360ec5235644553 [formerly 6f9129ac78]]
Former-commit-id: 6030625bf5e788ecaebe0b3ec7cdd364685df43e [formerly d600ed9acf]
Former-commit-id: 15267970e4
|
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: 71025bcc3d [formerly 81ca7a9e9f] [formerly c0d36e9a69] [formerly 71025bcc3d [formerly 81ca7a9e9f] [formerly c0d36e9a69] [formerly 1183c0538e [formerly c0d36e9a69 [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]]]
Former-commit-id: 1183c0538e
Former-commit-id: 886348da08 [formerly 52d5edac63] [formerly ad38ccbb38ccc3c1e25afc6279df150354266fb5 [formerly cb9e715aec]]
Former-commit-id: 7e40e67a6c3c32d32eefa89c005c098e6189c848 [formerly 10dee29029]
Former-commit-id: 7d03309e18
|
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: 479b22f6a1 [formerly ac0f0e2298] [formerly 0a9fc691b9] [formerly 479b22f6a1 [formerly ac0f0e2298] [formerly 0a9fc691b9] [formerly fbda7c4489 [formerly 0a9fc691b9 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]]
Former-commit-id: fbda7c4489
Former-commit-id: d1ce9eed5b [formerly fe1f9e8977] [formerly 42f3d41f4fbd3ce168d8d1117e5ce0b5a752ff73 [formerly 9e6433f44b]]
Former-commit-id: c95a4ea6c20a688372f25863036f83f25fb0d751 [formerly 6f0d007112]
Former-commit-id: 73bdd3a339
|
2014-07-01 10:22:25 -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: 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: d70da4127e [formerly 7fb4663d75] [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6 [formerly dcbab5621f]]
Former-commit-id: 8343b8e876918b72044e0b509f5b5b8afdbd53e2 [formerly 71357da9d2]
Former-commit-id: 8fb747ad27
|
2014-07-01 11:08:46 -04:00 |
|
Juliya Dynina
|
01f10d8e38
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 9fc999e435 [formerly bf765525b7] [formerly b5e4bc1fdc] [formerly 9fc999e435 [formerly bf765525b7] [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly b5e4bc1fdc [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]]
Former-commit-id: 102da2d0f7
Former-commit-id: 174d866359 [formerly b4d23902a7] [formerly 2d2b83dfaec86884c0ce72c54cf9440fd6074009 [formerly 7ed2a8cbd4]]
Former-commit-id: 4eefb3ff8da1d8b45bbb5382f3de7f17a72b1b23 [formerly 8f3581340b]
Former-commit-id: 5a9181fcc1
|
2014-07-01 10:05: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: 1024035422 [formerly 20eeb493bb] [formerly 6d9db0784a] [formerly 1024035422 [formerly 20eeb493bb] [formerly 6d9db0784a] [formerly e6ac1b2ec8 [formerly 6d9db0784a [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]]]
Former-commit-id: e6ac1b2ec8
Former-commit-id: 17839c2514 [formerly 2965150f36] [formerly f3ceb72fd3502a79aad5e85f5fd66b79cc0bab66 [formerly 3de8492ff3]]
Former-commit-id: a70bbfc5b1d3137936ce79f8cf308613fb74cf69 [formerly e659b5a694]
Former-commit-id: 8c2a97eb67
|
2014-07-01 09:48:20 -05:00 |
|
Nate Jensen
|
ee9c8b0fb9
|
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: 0080d97655 [formerly 03efa73bd7] [formerly 63bc6ed372] [formerly 0080d97655 [formerly 03efa73bd7] [formerly 63bc6ed372] [formerly fb84c94552 [formerly 63bc6ed372 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]]]
Former-commit-id: fb84c94552
Former-commit-id: d4b265fcca [formerly 7314f9c2f1] [formerly 4978882e135ef3f25c2e0ca1dfb306b8b77a8b49 [formerly 01115d0ad0]]
Former-commit-id: 771686decac75f30c6529d246ca4f20201dfebad [formerly a2ab4f6c76]
Former-commit-id: 94cd22b009
|
2014-06-30 16:21:09 -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: 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]]
Former-commit-id: fc70dbc86e
Former-commit-id: 7ffa3c80c1 [formerly b186894f32] [formerly a1b5881328dc0f2810d69ead13548d6326a348b7 [formerly 44f8b3dce1]]
Former-commit-id: 90997d544f594bee31f8c51f3afea29977b1417d [formerly 0be4260b4c]
Former-commit-id: be0185379b
|
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: e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly 48249301fc [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]]]
Former-commit-id: 48249301fc
Former-commit-id: 4dd144d873 [formerly 0f0e890fce] [formerly c525443c556f5d3c4e3585bc6ee865de49c0fa07 [formerly 1d6912b4dd]]
Former-commit-id: 8838747449e3a1b1a8d2c17d9a358b4e5376a19f [formerly 635e902b80]
Former-commit-id: d189ad3b7a
|
2014-06-30 15:53:41 -05:00 |
|
Nate Jensen
|
7f5285bf96
|
Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly 128950ec19 [formerly 766d3323d3 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]]]
Former-commit-id: 128950ec19
Former-commit-id: c8d32368ee [formerly 4ac06c06ee] [formerly d73b0a686415d6d641d233bfd24d10daefab34d7 [formerly 2bf3449e00]]
Former-commit-id: f3f1fbc5a2e3ec9b02255dccd1989db205cdb8ee [formerly 345de597a6]
Former-commit-id: 25b2c1fa3e
|
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: b3f0099029 [formerly 02037fc2df] [formerly 588d3084da] [formerly b3f0099029 [formerly 02037fc2df] [formerly 588d3084da] [formerly 07a7a00256 [formerly 588d3084da [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]]]]
Former-commit-id: 07a7a00256
Former-commit-id: 4f413032e3 [formerly e5f1eaf67d] [formerly fc579be7cecbd579b95c1f5d5f7bbe974dc68c31 [formerly c6e53f6a9b]]
Former-commit-id: 049ab47ed6895126be0b8ff0b09a75d6c325e763 [formerly 6046a2cbe1]
Former-commit-id: 44f67ce5ad
|
2014-06-30 13:15:31 -05:00 |
|
Qinglu.Lin
|
a4d359fce0
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 660d1c9ff2 [formerly 1180b31875] [formerly 1200633cd2] [formerly 660d1c9ff2 [formerly 1180b31875] [formerly 1200633cd2] [formerly 1d52d020eb [formerly 1200633cd2 [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]]]
Former-commit-id: 1d52d020eb
Former-commit-id: 712f3b0f46 [formerly 5e07f13dd8] [formerly 79c9a926a4430a2e87a6959f559d52c89cb1c374 [formerly 6e4b7e1e6d]]
Former-commit-id: d7eb9af4998b1fcd67d349f3068f4af192e86aff [formerly 3eaedad105]
Former-commit-id: 7235488050
|
2014-06-30 13:09:15 -04:00 |
|
Nate Jensen
|
8771aee35d
|
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: 914683e8a5 [formerly 1137ef84fd] [formerly 9fddc57142] [formerly 914683e8a5 [formerly 1137ef84fd] [formerly 9fddc57142] [formerly fdddf1e096 [formerly 9fddc57142 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]]]]
Former-commit-id: fdddf1e096
Former-commit-id: 108be98832 [formerly cc66308aaa] [formerly 9468d0a901837ec71be397a13e71483e27e0c273 [formerly 1ac5c54ee3]]
Former-commit-id: 44b6830b6ca7df9073bb2997f0cd12ba1cc234a3 [formerly c6c921279a]
Former-commit-id: 29a41f81c2
|
2014-06-30 12:03:21 -05:00 |
|
Slav Korolev
|
896b7c59d1
|
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 64e9564de0 [formerly cd740de298] [formerly 1b870e21fc] [formerly 64e9564de0 [formerly cd740de298] [formerly 1b870e21fc] [formerly 1956077e1a [formerly 1b870e21fc [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]]]
Former-commit-id: 1956077e1a
Former-commit-id: 3e4c08d4ef [formerly e8811128fc] [formerly f18e8934ed21b7acc8f3181e19942bfba56cdf4c [formerly 0f5a2c0233]]
Former-commit-id: c7a99399c01956b4c0308375cdf8c555baeec8f2 [formerly a78f0ea765]
Former-commit-id: 5395df01c9
|
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: 5a74a3cf99 [formerly bcffac8875] [formerly 706409b459] [formerly 5a74a3cf99 [formerly bcffac8875] [formerly 706409b459] [formerly f4cdd661fe [formerly 706409b459 [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]]
Former-commit-id: f4cdd661fe
Former-commit-id: 570bf42f89 [formerly b94dc3b045] [formerly 9e7fc0b82ae20bc6493ceddb6809f83261c06966 [formerly e3c3d55883]]
Former-commit-id: 731bb0268edd89c419ea3b8bb57b91ea5afc516a [formerly 25dd598b55]
Former-commit-id: 50fdb66cb4
|
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: 90dd05664d [formerly cfdb8eebfc] [formerly 48aceec348] [formerly 90dd05664d [formerly cfdb8eebfc] [formerly 48aceec348] [formerly cfb9e6d0ad [formerly 48aceec348 [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]]]]
Former-commit-id: cfb9e6d0ad
Former-commit-id: bc43fa3722 [formerly d15be4d4a1] [formerly eb62a7da73e93f0a97aa85a3191e21df053469ca [formerly b1810026c8]]
Former-commit-id: ffce97b79e3bf6cf71a787a276401e8ab159977a [formerly 8b8f6ff0fe]
Former-commit-id: 3847155429
|
2014-06-27 16:51:36 -05:00 |
|
Brian Clements
|
e25a446dae
|
Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: c2cd991296 [formerly 023d1bde0b] [formerly dc7a76197d] [formerly c2cd991296 [formerly 023d1bde0b] [formerly dc7a76197d] [formerly fe149faffa [formerly dc7a76197d [formerly e216af49d135ceeff5e6cd251c6742602230553c]]]]
Former-commit-id: fe149faffa
Former-commit-id: 6bae8b556c [formerly b8dc75d192] [formerly 54898f3b2d36260900cf96d8c93cda806a155e01 [formerly cb108f12b8]]
Former-commit-id: f94b54e29b3d2880b30c8a131c9ec16015f7c641 [formerly 0800ea7cb7]
Former-commit-id: ac986ca600
|
2014-06-27 16:33:27 -05:00 |
|
Brian Clements
|
1fc32ef3c5
|
Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: 9425ad16a3 [formerly eb806a6bb3] [formerly 741afe7d39] [formerly 9425ad16a3 [formerly eb806a6bb3] [formerly 741afe7d39] [formerly 31a08efb61 [formerly 741afe7d39 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]]]
Former-commit-id: 31a08efb61
Former-commit-id: 46526f932b [formerly 2350f7f630] [formerly 93c5a5d813b69eae74ceea0b7251e483a789c393 [formerly ed2823daef]]
Former-commit-id: a6fba588dbe193fe0fe78c90743505b834dd3904 [formerly c1bfab0914]
Former-commit-id: 55e3b3673c
|
2014-06-27 15:33:11 -05:00 |
|
David Friedman
|
f2728065ba
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: 5c62d368ea [formerly c4967a96fb] [formerly 18b3b61afc] [formerly 5c62d368ea [formerly c4967a96fb] [formerly 18b3b61afc] [formerly dc25040a25 [formerly 18b3b61afc [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]]]
Former-commit-id: dc25040a25
Former-commit-id: 2e4cf863dd [formerly 217aa6ce76] [formerly 7b3bdb180812815c4f2d1bc65959d40cce07d595 [formerly b546ca6ac8]]
Former-commit-id: d5d8e4678be9cbb6c94920e0cb97562c13b4888f [formerly a756c1436b]
Former-commit-id: 18b1d17550
|
2014-06-27 19:17:55 +00:00 |
|
Slav Korolev
|
e3d989504c
|
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: 0f048d2c0c [formerly 6e60afd8cf] [formerly b72f146d95] [formerly 0f048d2c0c [formerly 6e60afd8cf] [formerly b72f146d95] [formerly f6e8dedfa3 [formerly b72f146d95 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]]]]
Former-commit-id: f6e8dedfa3
Former-commit-id: 7fa0a80090 [formerly 34d57cd15e] [formerly 31447de11fcb6e2546cb39702813ba6cf2f0ba14 [formerly 03890f03e3]]
Former-commit-id: 8ed7b73c8cf35ecfa3aac5e18de6fbaf88b30690 [formerly 99fc9b951a]
Former-commit-id: a8e4449248
|
2014-06-27 12:29:25 -04:00 |
|
Richard Peter
|
99c550709e
|
Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: 1a472d4b2e [formerly 6bc89f2420] [formerly 46f42687e2] [formerly 1a472d4b2e [formerly 6bc89f2420] [formerly 46f42687e2] [formerly 56389ef395 [formerly 46f42687e2 [formerly e16fd779239a09735d6ea092058a39bc7263b2f1]]]]
Former-commit-id: 56389ef395
Former-commit-id: bcf92a4b08 [formerly 2d18721bd6] [formerly 395291351cc63f90d7019e4eb6186c1ef830f36e [formerly 5112bbb8d5]]
Former-commit-id: 40b5d58c95a8b7c0f6129a2b1c88baa2f6af8cdf [formerly c5003ff6c4]
Former-commit-id: 7daa1ed24b
|
2014-06-26 17:46:57 -05:00 |
|
Matt Nash
|
b6e460a97a
|
Omaha #3303 make FFMPResource interrogatable
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540
Former-commit-id: baf64e4a41 [formerly 8f71be817f] [formerly 2be9c89722] [formerly baf64e4a41 [formerly 8f71be817f] [formerly 2be9c89722] [formerly 58a9434254 [formerly 2be9c89722 [formerly 848a7c7428a42fe164312363c4eb3e4080d90d66]]]]
Former-commit-id: 58a9434254
Former-commit-id: afdac2bafd [formerly d4b6c9803e] [formerly a3d17e4f46d08b2176b5ac7766da43408244c04f [formerly a82e71702a]]
Former-commit-id: bf26c0317b05796c264b1626da690d41db48f07c [formerly 0bfa8347a4]
Former-commit-id: adc1a6df6d
|
2014-06-26 17:30:22 -05:00 |
|
Nate Jensen
|
f6d1119040
|
Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
Former-commit-id: 8e716b3d95 [formerly 59ab35e889] [formerly 024bc29e10] [formerly 8e716b3d95 [formerly 59ab35e889] [formerly 024bc29e10] [formerly 1f6df7f52f [formerly 024bc29e10 [formerly 40a9f54b7354de60eaf2b94d10615b2d6ad0720f]]]]
Former-commit-id: 1f6df7f52f
Former-commit-id: c2b644f4f0 [formerly 0c9596bff8] [formerly 6a3f1ad5122f1bb80c5298f408960868796a628e [formerly 96a065399e]]
Former-commit-id: 893c04d3b75c57a7f1ad2ecd752ed991d4b222ed [formerly 58791a046a]
Former-commit-id: 329f14de63
|
2014-06-26 15:26:21 -05:00 |
|
Nate Jensen
|
db86c797a0
|
Omaha #3236 thin client pref page supports proxy server as text or combo
field
Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0
Former-commit-id: 6bb1046927 [formerly e5c3c32bcb] [formerly f4c1691c8d] [formerly 6bb1046927 [formerly e5c3c32bcb] [formerly f4c1691c8d] [formerly 061482b015 [formerly f4c1691c8d [formerly 1a9433a524e5b8267fc3303db0763ac4685ec46d]]]]
Former-commit-id: 061482b015
Former-commit-id: c42d328429 [formerly dc99cf6c15] [formerly bc9de07f4e93861a5ad39757d852e64ad9f15a41 [formerly 40a3c0a372]]
Former-commit-id: 2dc074be3b70d9267c463e477fa249d6759b4dc6 [formerly 392ddd5ce0]
Former-commit-id: f957dd8e18
|
2014-06-26 15:06:38 -05:00 |
|
Slav Korolev
|
594c28c023
|
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: ec134c82d1 [formerly 41e8e36b8d] [formerly 900d5e8fbe] [formerly ec134c82d1 [formerly 41e8e36b8d] [formerly 900d5e8fbe] [formerly 79f2c0efc6 [formerly 900d5e8fbe [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]]]]
Former-commit-id: 79f2c0efc6
Former-commit-id: af6e5d0d24 [formerly 90ad46ac58] [formerly 0779b5b65e56e3aca2f1181750d2562c333a3f3a [formerly 3b9ed35eb0]]
Former-commit-id: 7d40d99d01e0c2d54fed5e98555f22bfcfe5f213 [formerly 0a006483ae]
Former-commit-id: 81ae177c42
|
2014-06-26 14:04:34 -04:00 |
|
Roger Ferrel
|
f0a6f0841f
|
Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly 75e0d18dc9 [formerly 32ae3ba73f] [formerly bd2d40faee] [formerly ad6eac6e20 [formerly bd2d40faee [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]]
Former-commit-id: ad6eac6e20
Former-commit-id: c6e2725ccb [formerly 6e37a43757] [formerly bfed3ce96674059d15316bcc9f04471a2469b25b [formerly 801bdc8fc7]]
Former-commit-id: 2e59e5b070ee1cbe0348eca7fc85285c2835dcc9 [formerly 7fef8ed924]
Former-commit-id: f954d93c5a
|
2014-06-26 11:16:09 -05:00 |
|
Brian.Dyke
|
3295154a2b
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 5b88408af1 [formerly a48268a1d6] [formerly a5ae302690] [formerly 5b88408af1 [formerly a48268a1d6] [formerly a5ae302690] [formerly 3df14b5a94 [formerly a5ae302690 [formerly 632577244e843dd122c00b745e973730c7920246]]]]
Former-commit-id: 3df14b5a94
Former-commit-id: 6da2ede9a5 [formerly 88411f7f52] [formerly 83724e09627d39b69b326bff065865d4439a3263 [formerly 97619031c9]]
Former-commit-id: e982c4d9565c1143f60c3bb8c3d493b9960113bd [formerly 9197f47f29]
Former-commit-id: a1d171c6c3
|
2014-06-26 10:39:49 -04:00 |
|
Nate Jensen
|
66ab17a9a8
|
Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
Former-commit-id: 42495a5551 [formerly 7b44d8ad2d] [formerly 589f74f6d8] [formerly 42495a5551 [formerly 7b44d8ad2d] [formerly 589f74f6d8] [formerly 49a592b19f [formerly 589f74f6d8 [formerly 3d352136996875ff1e66b9e41244d53e16a1b2c3]]]]
Former-commit-id: 49a592b19f
Former-commit-id: 78ccc8922c [formerly c73138b29e] [formerly 07db96ba799a55bc88db475276f8fed8e524ee12 [formerly 2b3f7f02e5]]
Former-commit-id: d8b0dddfe938e999c3a69db10cfa3c66ec3973ba [formerly e5c63a67ac]
Former-commit-id: 30d4d8fe27
|
2014-06-25 12:07:28 -05:00 |
|
Ben Steffensmeier
|
a91e213b4f
|
Omaha #3164 Disable compression on server error 500.
Former-commit-id: feeef994a9 [formerly 7df0be0722] [formerly d7cdfa655d] [formerly feeef994a9 [formerly 7df0be0722] [formerly d7cdfa655d] [formerly 120e9099e4 [formerly d7cdfa655d [formerly 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e]]]]
Former-commit-id: 120e9099e4
Former-commit-id: 20bc155506 [formerly 93ecdeeb08] [formerly f94c53315410df314a83f5e6e963796cd9ddd49e [formerly 8ea38a01a3]]
Former-commit-id: e096e7a2d40227945e7fb1d2a3c83b5cfaa9f584 [formerly 05ad65e8a0]
Former-commit-id: c0b839ce78
|
2014-06-25 11:13:39 -05:00 |
|
Nate Jensen
|
9afe98bf2b
|
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
Former-commit-id: af46dfd419 [formerly c9696dbd3b] [formerly 791ab4913c] [formerly af46dfd419 [formerly c9696dbd3b] [formerly 791ab4913c] [formerly 4bd68c8bd0 [formerly 791ab4913c [formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]]]]
Former-commit-id: 4bd68c8bd0
Former-commit-id: 05c81f432b [formerly 299c77f875] [formerly 8061c2ddd36f44e33ab8f0c40752fafbbbe7409b [formerly ce7812983a]]
Former-commit-id: 98f991d11bbde4854fbbda437ae830942345566a [formerly 374fb4373e]
Former-commit-id: 124d873714
|
2014-06-25 09:54:38 -05:00 |
|
Nate Jensen
|
e881e3afdd
|
Omaha #3236 thin client connectivity dialog remembers past proxy servers
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a
Former-commit-id: f388fc9e22 [formerly 054e8ba9b9] [formerly 3b1c37dc38] [formerly f388fc9e22 [formerly 054e8ba9b9] [formerly 3b1c37dc38] [formerly 760b0cb584 [formerly 3b1c37dc38 [formerly 353872377cc3f96db4d3a22c6646fccb3edcb865]]]]
Former-commit-id: 760b0cb584
Former-commit-id: 5634845b65 [formerly ad647e2e85] [formerly 1191a36dc2bdc04783f33dac9ef3cd444f527ced [formerly a727313c41]]
Former-commit-id: 37cd511e3e38aa4d5884885f5c1a092db0977af3 [formerly 5854347d2b]
Former-commit-id: 73bc714f93
|
2014-06-25 08:54:24 -05:00 |
|
Nate Jensen
|
dd88b1c3dd
|
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
Former-commit-id: 17e4bd9707 [formerly 9c058c1e56] [formerly eacd31aa9b] [formerly 17e4bd9707 [formerly 9c058c1e56] [formerly eacd31aa9b] [formerly 425651652d [formerly eacd31aa9b [formerly 45ac7ca480ea49dabff490ccc5b29878f0481b90]]]]
Former-commit-id: 425651652d
Former-commit-id: cf14ebd812 [formerly 7d54b214e1] [formerly 42770a7bda9b6c60ffa646d2171d3d52037e0ecf [formerly 3b288534e4]]
Former-commit-id: fcdd3f6f43d57cf12f9606e6ec2640a2cb5f8584 [formerly c811adf70b]
Former-commit-id: 0938ff0ab7
|
2014-06-25 08:32:25 -05:00 |
|
Steve Harris
|
d85d6e3d7c
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LockingFileOutputStream.java (moved to ufcore)
Former-commit-id: 80d4e29167 [formerly c6aa4b6cbd] [formerly d9a3129339] [formerly 80d4e29167 [formerly c6aa4b6cbd] [formerly d9a3129339] [formerly 23d0cf81f8 [formerly d9a3129339 [formerly 11c37fed7aed29ee42661948db90fab14b49c93c]]]]
Former-commit-id: 23d0cf81f8
Former-commit-id: 4ce15f3642 [formerly 5a5b95e88e] [formerly fb85df5f20cce260e0bb7de9e36d6bb272141638 [formerly f6f5c5a395]]
Former-commit-id: 285ed0388fe5cc149e690eeccae8d189bfb94c59 [formerly 766c6ca296]
Former-commit-id: deb3e3e437
|
2014-06-25 07:11:58 -05:00 |
|
Ben Steffensmeier
|
ac910bf48f
|
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 0a9e0932ce [formerly 08fe257daa] [formerly e244664b7d] [formerly 0a9e0932ce [formerly 08fe257daa] [formerly e244664b7d] [formerly 5c4f89644c [formerly e244664b7d [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]]]
Former-commit-id: 5c4f89644c
Former-commit-id: 216f6615df [formerly d52b2254f5] [formerly cdfe226fd4f2936b8857ca657cf932d134dc0f2f [formerly 4d22a3c58e]]
Former-commit-id: 0238336c4ba4ce650a90647685bf7af41b2168f5 [formerly 397f83b2da]
Former-commit-id: 8dbd523f44
|
2014-06-24 18:16:09 -05:00 |
|
Brian Clements
|
984043b7b6
|
Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: bb9ea8688b [formerly 27a0d3fb28] [formerly 0f25ac3b5b] [formerly bb9ea8688b [formerly 27a0d3fb28] [formerly 0f25ac3b5b] [formerly 3b71bedd14 [formerly 0f25ac3b5b [formerly aceeff1e02c896ff27794755eb10fc275718a68c]]]]
Former-commit-id: 3b71bedd14
Former-commit-id: 2b0a3b71be [formerly 91d1378c31] [formerly 777e6a4c592f7446174da9efb1e7a8578faea8b6 [formerly be3d47e5e9]]
Former-commit-id: 02b429c884ef9326e34cb1c454c39abcfa429ef4 [formerly f1a30bf16e]
Former-commit-id: be85fe241f
|
2014-06-24 11:15:45 -05:00 |
|
Steve Harris
|
6285d3dac6
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 7f040f069c [formerly 3f2058a1ab] [formerly 89606076ec] [formerly 7f040f069c [formerly 3f2058a1ab] [formerly 89606076ec] [formerly ddc6f2092a [formerly 89606076ec [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]]
Former-commit-id: ddc6f2092a
Former-commit-id: dd6d6c031d [formerly 304d918a7c] [formerly 018aec814b6ca7a979cdc1b5c53150d6797d0df5 [formerly 1f033d22e6]]
Former-commit-id: 7b12be7aa1ce8ea1ba2ec797cf62aa5d09c44514 [formerly 323c240f59]
Former-commit-id: 2841134c60
|
2014-06-24 10:57:56 -05:00 |
|
Ben Steffensmeier
|
e683a9e5b9
|
Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 886e738c6f [formerly 2c1988017e] [formerly aaa146b2d0] [formerly 886e738c6f [formerly 2c1988017e] [formerly aaa146b2d0] [formerly 46b8688597 [formerly aaa146b2d0 [formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]]]]
Former-commit-id: 46b8688597
Former-commit-id: a638ba05b1 [formerly 9edc1153de] [formerly 91aee63991f0525d37934c2e6dc7774e0f24ffb3 [formerly c184936340]]
Former-commit-id: 1e516e8c449d0c3d54c14bc6e3374606e4c9e7af [formerly 17e92d31bd]
Former-commit-id: 364953e5b7
|
2014-06-24 10:57:02 -05:00 |
|
steve.naples
|
d7ff8a2638
|
ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: e994aa9482 [formerly 2a49bbda2f] [formerly efe877d82b] [formerly e994aa9482 [formerly 2a49bbda2f] [formerly efe877d82b] [formerly 90ed511478 [formerly efe877d82b [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]]
Former-commit-id: 90ed511478
Former-commit-id: b8d5f833ec [formerly 2e77b74c44] [formerly f502e650f306b12ad50f762f688616a9b1039de1 [formerly 362e1ce880]]
Former-commit-id: d75382cb3e72ed1c52902aa0d9f71c8e7e9c77f6 [formerly 5dcda5cabc]
Former-commit-id: 3638879057
|
2014-06-24 15:52:23 +00:00 |
|
Nate Jensen
|
88a208a5b6
|
Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
Former-commit-id: a6f039c7cf [formerly 26ba9ff221] [formerly 2d98fb83fc] [formerly a6f039c7cf [formerly 26ba9ff221] [formerly 2d98fb83fc] [formerly 476eda3585 [formerly 2d98fb83fc [formerly 83cd4ad4af6ac2f90a280fa1367ef88949870dc0]]]]
Former-commit-id: 476eda3585
Former-commit-id: 453f463f3f [formerly 8ee8589609] [formerly e54d56f7e1c2e8e42b2d1976cf5f52eff642a1a9 [formerly fdc0dacf68]]
Former-commit-id: 7225ed94e8f3acc14d02a5ce59a109b025d4d0ae [formerly 4b343962dd]
Former-commit-id: eed3ec1650
|
2014-06-23 17:45:11 -05:00 |
|
Ben Steffensmeier
|
009506e75d
|
Omaha #3238 Implement Interrogatable in SatResource.
Former-commit-id: d6e503bddf [formerly b1f14f631a] [formerly ca853f7e93] [formerly d6e503bddf [formerly b1f14f631a] [formerly ca853f7e93] [formerly 7fe130b6e2 [formerly ca853f7e93 [formerly 698a2b174606c8425778f5672b613f2d74fb8997]]]]
Former-commit-id: 7fe130b6e2
Former-commit-id: b92ea37204 [formerly 4bf1990d8a] [formerly c5713b80950d5c776f603eee24d78e88dfb552e5 [formerly 40041b4f7d]]
Former-commit-id: 66a935ef135d94a9fe49f4aa8bb59b724a369d40 [formerly a2119ef3a0]
Former-commit-id: fc0be3eb47
|
2014-06-23 17:21:43 -05:00 |
|
Lee Venable
|
378b53eecf
|
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: e841c8d454 [formerly c4d064369d] [formerly 1e561fbc8d] [formerly e841c8d454 [formerly c4d064369d] [formerly 1e561fbc8d] [formerly 4b9c65f6c4 [formerly 1e561fbc8d [formerly 1c1f7dc0d3fb7627ff61032b3baa6c6781a35718]]]]
Former-commit-id: 4b9c65f6c4
Former-commit-id: e58873288f [formerly 70ebd1ea58] [formerly 1afba3928fd4aefbf945f6d1391751d084270137 [formerly 9457dd4774]]
Former-commit-id: 291e5cdd1663e13d724fbbf36b7ab4232f7a287a [formerly 1ff51ed165]
Former-commit-id: 4ccc00aaa9
|
2014-06-23 16:29:24 -05:00 |
|
Lee Venable
|
cf2d07dc47
|
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
Former-commit-id: 9bf95b70f4 [formerly 6418906d23] [formerly 2401caa24f] [formerly 9bf95b70f4 [formerly 6418906d23] [formerly 2401caa24f] [formerly a176a26618 [formerly 2401caa24f [formerly 363ddb4af1075686fc5a1d80df884f59d93d7b99]]]]
Former-commit-id: a176a26618
Former-commit-id: d42483b97b [formerly db11f9af58] [formerly ad85813faddea040000be3a045a46285059ed2f6 [formerly ab5d8d6204]]
Former-commit-id: dcee143264a9cf71306a16e55fa54bf031f9ca52 [formerly da158b0d70]
Former-commit-id: 09c582a70a
|
2014-06-23 15:37:10 -05:00 |
|
Nate Jensen
|
c6a5e63e8c
|
Omaha #3133 remove unnecessary plugins
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: 1cb291c5cd [formerly b92a2671f3] [formerly 5e30984a41] [formerly 1cb291c5cd [formerly b92a2671f3] [formerly 5e30984a41] [formerly 2f85537a55 [formerly 5e30984a41 [formerly 04d26bedbe8d6ccf7a353159f27b133aff42970e]]]]
Former-commit-id: 2f85537a55
Former-commit-id: 842078e46f [formerly 123679b8ec] [formerly 3a393ce00303a10edce67a535645d9aef98d33d4 [formerly 544b0f0dd9]]
Former-commit-id: 78c1e46c0903c00a44ba416b63235d65a4d60ba6 [formerly 8bcc2155c6]
Former-commit-id: fde6ed28ce
|
2014-06-23 13:00:44 -05:00 |
|
Nate Jensen
|
4fc569b95a
|
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: ebc605e2e8 [formerly 718d941c23] [formerly 61640d5c22] [formerly ebc605e2e8 [formerly 718d941c23] [formerly 61640d5c22] [formerly 172f18a5b1 [formerly 61640d5c22 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]]]]
Former-commit-id: 172f18a5b1
Former-commit-id: 2379acd8af [formerly 4e8d9343dd] [formerly 1441fd58c94eb2aaf9f5d6b380a7d531add46179 [formerly 48995ed5ca]]
Former-commit-id: 2d2da3845b08d3d4b4e3c1d6df05ccb3616d08ad [formerly 217a0999d0]
Former-commit-id: b54b30e037
|
2014-06-23 12:12:03 -05:00 |
|
Nate Jensen
|
18e78f42d9
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: cfd3efcfe2 [formerly c7c0d9cb4b] [formerly 51da67dd3f] [formerly cfd3efcfe2 [formerly c7c0d9cb4b] [formerly 51da67dd3f] [formerly 97ef9fc343 [formerly 51da67dd3f [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]]]
Former-commit-id: 97ef9fc343
Former-commit-id: 1d50803d20 [formerly 416e6fc85d] [formerly 2bea2ce9efcdf786438dba2900ce1aaaf1cf5e3b [formerly a3c20eb98a]]
Former-commit-id: 49f94b32b485b3b8042a4e7e0f9a84d3a790f3e7 [formerly 9a3a4d5bfd]
Former-commit-id: b1ab93a361
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
7e7529e482
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: bab435f286 [formerly af06c5a890] [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31 [formerly 66d30e59a3]]
Former-commit-id: 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53 [formerly 935542914d]
Former-commit-id: 196f53e609
|
2014-06-20 14:01:55 -04:00 |
|
Brian Clements
|
3ef4cf722a
|
Omaha #3281 peer2peer chat view improvements
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)
Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d
Former-commit-id: c2ac40caec [formerly f053e9b084] [formerly 9d626a97e5] [formerly c2ac40caec [formerly f053e9b084] [formerly 9d626a97e5] [formerly 93a1ee71c4 [formerly 9d626a97e5 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]]]
Former-commit-id: 93a1ee71c4
Former-commit-id: a5f70b0e92 [formerly 3eb4cd513c] [formerly 19045905bf3f712c73a4de48818e485b9aaeb892 [formerly a9827ef8e8]]
Former-commit-id: 9ad39c4d0c064523e2d3ba343082d0567e667e2a [formerly 7060fe3fba]
Former-commit-id: bb58783ca4
|
2014-06-20 09:04:15 -05:00 |
|