steve.naples
|
33e95d1e49
|
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly bf9924b0e9 [formerly 4205d83452] [formerly 1856a05319] [formerly ff52f1dc0a [formerly 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 899ff32548 [formerly 1532c683a1] [formerly 2916716519dd7ee38032637d8a99f6fb81e1e7ba [formerly 211e9f7546]]
Former-commit-id: cc4eaa9f2dd1e8e914858e1e4828f637b78454d8 [formerly 3f11e82772]
Former-commit-id: 03f50a48f1
|
2014-08-28 16:08:17 +00:00 |
|
Ron Anderson
|
7cc1ad7088
|
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 2b88ade974 [formerly bb1e80b844 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]]
Former-commit-id: 2b88ade974
Former-commit-id: c6eb33afcc [formerly 39d00a72ce] [formerly 36188db03ab5afd51b2833d61639eaa10519a6f7 [formerly 0962c75d18]]
Former-commit-id: 86f00e159c29c3c94d7aa9fffb6a0183327a64c0 [formerly 56b56ea4f3]
Former-commit-id: 932d9e2783
|
2014-08-28 10:43:54 -05:00 |
|
David Friedman
|
64b66c9dde
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly bb421fd3e4 [formerly ea1e9feb1d] [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]]
Former-commit-id: ea9230b37c
Former-commit-id: 25e0bcdc6f [formerly 10114b0bd1] [formerly 74a7d88387ec143a88a15084374737200a0e031a [formerly bc22f7309c]]
Former-commit-id: 2553d508e5b2d1bb6b928ee04f40220c66d897ac [formerly bfc3fa98b4]
Former-commit-id: 39c7024668
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
0ae9b53ca6
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: cbfd380b43 [formerly 76bd6575b6] [formerly 47ae6015e5] [formerly cbfd380b43 [formerly 76bd6575b6] [formerly 47ae6015e5] [formerly a24794ca7b [formerly 47ae6015e5 [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]]
Former-commit-id: a24794ca7b
Former-commit-id: 7288e9be2a [formerly 065b05e38c] [formerly d87cfe22daebbd0f64708e2b5401b5a9bc43a95e [formerly 0e9a17540d]]
Former-commit-id: 7849df2750377b7bb32208974c538f9b11a2620a [formerly bab69f3764]
Former-commit-id: c5aec69ab3
|
2014-08-28 11:39:48 -04:00 |
|
Nate Jensen
|
3876f26da7
|
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 8536f6681a [formerly 2710aed225 [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]]]]
Former-commit-id: 8536f6681a
Former-commit-id: b43a6418c7 [formerly f5810478ef] [formerly 10bd606cc6bf2a29f554ff34922524754debf4cf [formerly 3ddebb2170]]
Former-commit-id: 508ea1dcd7bc0ca2f7c09a313763aafa791fb985 [formerly 288db1aea0]
Former-commit-id: 94cf9816c7
|
2014-08-27 16:27:40 -05:00 |
|
Roger Ferrel
|
1b663590b4
|
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 9154ef60bb [formerly fa42c4069a [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]]
Former-commit-id: 9154ef60bb
Former-commit-id: db74982258 [formerly 17a8bd795d] [formerly 9c8c9bee1d8c31a829aaaca5968d61664e6d90fe [formerly 63a1b2890b]]
Former-commit-id: 5974e03bca22ea6311652bc9faaa322fe570944a [formerly 6e695a12d1]
Former-commit-id: 87b0200274
|
2014-08-27 15:06:52 -05:00 |
|
Brian.Dyke
|
2da6c7b93b
|
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: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|
Nate Jensen
|
f63011dc93
|
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 7acf4a04b2 [formerly 6fca563d21 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]]]]
Former-commit-id: 7acf4a04b2
Former-commit-id: 1f9c98e8c4 [formerly 783a805a8a] [formerly 1343844853810696ccafe2e8795d21ef1b7f8773 [formerly ff03dc5783]]
Former-commit-id: d1035c455860cde4dc794860a8608b437f23c688 [formerly 60b0b76d42]
Former-commit-id: ba9c46532e
|
2014-08-27 09:54:49 -05:00 |
|
Nate Jensen
|
cac6498b0f
|
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ad37de1ef [formerly 2d1d18b2ff [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]]]]
Former-commit-id: 1ad37de1ef
Former-commit-id: b1f76d8b6d [formerly dc09d337f2] [formerly 39d951ec78dac285126b4df9a10e17fcf4d51d7c [formerly 571ae1d09e]]
Former-commit-id: 13aaf18bc8f110c0e6efa2fd45f405582d1ff00a [formerly 376670d221]
Former-commit-id: a739387842
|
2014-08-27 09:54:24 -05:00 |
|
Brian Clements
|
392cfad0e2
|
Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly f871058f67 [formerly a609334abf [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]]]
Former-commit-id: f871058f67
Former-commit-id: 3061205a6b [formerly f179d62459] [formerly 28575adbedc1689f7fc46cd5d53fb04c3af8bd28 [formerly e02be806d0]]
Former-commit-id: 3cb76351d8871b831667f7940cd204584bb11974 [formerly aa0cdd843c]
Former-commit-id: fcb9de6bf4
|
2014-08-26 17:22:20 -05:00 |
|
Nate Jensen
|
5e714459ca
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly dbbf012a34 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: 5690db1e94 [formerly 85a17ed23f] [formerly ec90e4ec5b78799ff8c90c5659475672966cd75e [formerly 70216d11e4]]
Former-commit-id: ca13b3031bbdcc900e3e1367503501855ce76f87 [formerly cf2e6693ed]
Former-commit-id: ac5a4234cb
|
2014-08-26 16:45:00 -05:00 |
|
Steve Harris
|
146dc3aec7
|
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: 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]]
Former-commit-id: 038b284066
Former-commit-id: 00b3ad8eb6 [formerly 1da31a86dc] [formerly c9abc2fce0e20d37683d43d809074ccd92db5423 [formerly c8ba2b1ae6]]
Former-commit-id: c07303fea0c9c3e107dabbeefbd395be90d9018f [formerly 84edac842e]
Former-commit-id: 9d263bc542
|
2014-08-26 16:25:21 -05:00 |
|
Brian.Dyke
|
8f7c518c0d
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: aa2b4835e3 [formerly 3459e1fcbc] [formerly d168e371aa] [formerly aa2b4835e3 [formerly 3459e1fcbc] [formerly d168e371aa] [formerly 175f4e67c1 [formerly d168e371aa [formerly a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3]]]]
Former-commit-id: 175f4e67c1
Former-commit-id: e1e5e82038 [formerly b3b2a8f365] [formerly 8fd80abba55af1ef07035306474c97175aadc433 [formerly 25282d10ac]]
Former-commit-id: c614c8d052db2c431862195fd45edf538069003d [formerly caee2cd9a0]
Former-commit-id: a85b872d1f
|
2014-08-26 15:00:55 -04:00 |
|
Nate Jensen
|
54a6cbb8d9
|
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
Former-commit-id: bb4552ee2a [formerly 41e6446b49] [formerly 704ebac10a] [formerly bb4552ee2a [formerly 41e6446b49] [formerly 704ebac10a] [formerly b92d94d19d [formerly 704ebac10a [formerly d5db15de813a41767a1a10b0bfa07eb88c8dff6e]]]]
Former-commit-id: b92d94d19d
Former-commit-id: 8d0581a66d [formerly 0eea7a1105] [formerly 3efaa74664a741826024a3da6466b18e7749417f [formerly 08a3bcd85e]]
Former-commit-id: b4b5c391fc7f4c698dc46a1605859a8efe51d29f [formerly 0e17b3331e]
Former-commit-id: c107a88f8c
|
2014-08-26 13:42:13 -05:00 |
|
Brian.Dyke
|
bcdb3d4c19
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: acc3321457 [formerly 489fec4b25] [formerly 86f0ed23c1] [formerly acc3321457 [formerly 489fec4b25] [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 86f0ed23c1 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]]
Former-commit-id: b3767167c7
Former-commit-id: ef2afe4f88 [formerly 1b9a28cc62] [formerly dfa43aa5c4d4a07843b46cd3b23eed8a26739086 [formerly f2b9203001]]
Former-commit-id: ab64fc858eafb7e5c8697e4fe618a1b8621ed5d0 [formerly 677ce2fb94]
Former-commit-id: 16dc3b41de
|
2014-08-26 13:31:34 -04:00 |
|
Daniel.Huffman
|
75cbc60355
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: d7c82cf4be [formerly e2e132e7a5] [formerly 8962a069be] [formerly d7c82cf4be [formerly e2e132e7a5] [formerly 8962a069be] [formerly d1cd90b487 [formerly 8962a069be [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]]]
Former-commit-id: d1cd90b487
Former-commit-id: ebae452135 [formerly 7d09253674] [formerly 1d0b849f95b96d174f8fe7e2dac8ce729d2a1e58 [formerly 64672eb478]]
Former-commit-id: 9d4bcd480a7638756243875bdd8b10b8f6045689 [formerly ea8ec5fbe7]
Former-commit-id: 8c6fd18ece
|
2014-08-26 13:30:09 +00:00 |
|
Ron Anderson
|
b9e30e763e
|
Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
Former-commit-id: 8ac2010d4b [formerly 3ffadac038] [formerly 753b715493] [formerly 8ac2010d4b [formerly 3ffadac038] [formerly 753b715493] [formerly 73fec5c36a [formerly 753b715493 [formerly 2cfb44f69025ba06e85a44e481bac1f88b851834]]]]
Former-commit-id: 73fec5c36a
Former-commit-id: 2b0d089159 [formerly 0ee02920ec] [formerly b43d8ff03fa7f849326b6b4c9e8f7f4d9dc9e336 [formerly eabf14a6fe]]
Former-commit-id: 491d492fa4a915cabddd8a0f0de16ff2e0a90882 [formerly 01dcd5de10]
Former-commit-id: 0d75ae75e3
|
2014-08-25 16:18:58 -05:00 |
|
Nate Jensen
|
90b1e0e9aa
|
Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
Former-commit-id: 2b15b6587e [formerly 76ca1815ad] [formerly 2516c869d2] [formerly 2b15b6587e [formerly 76ca1815ad] [formerly 2516c869d2] [formerly 1a48a8190f [formerly 2516c869d2 [formerly 5a0ccfe4b1effb0946e6d542c492bff45d6a904b]]]]
Former-commit-id: 1a48a8190f
Former-commit-id: 0c29cd1459 [formerly 2c09a51125] [formerly 384de854114c5b7d5c6b0092155676b848520f53 [formerly 85ececab93]]
Former-commit-id: a5fb452d823fa52df2cf390630ecc21a79fecbe8 [formerly 3ece89083f]
Former-commit-id: 626417bde9
|
2014-08-25 14:14:47 -05:00 |
|
Ron Anderson
|
fc6ff76874
|
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: dee9a699ad [formerly 03173a9fe7] [formerly 4e6bbb4be4] [formerly dee9a699ad [formerly 03173a9fe7] [formerly 4e6bbb4be4] [formerly 4285719a08 [formerly 4e6bbb4be4 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]]]]
Former-commit-id: 4285719a08
Former-commit-id: 1e3a94e3e4 [formerly fe93cb7510] [formerly 06e2debcd2974ef2d50793405e7728d260c70777 [formerly 6c3cafda59]]
Former-commit-id: b90a38bfc9b4cb38537b03a88e5468d30019bf90 [formerly 566db58f13]
Former-commit-id: a46f13d161
|
2014-08-25 14:04:41 -05:00 |
|
Mark Peters
|
c71622cbb3
|
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: 90833244de [formerly c7486f3952] [formerly 7b37c4d188] [formerly 90833244de [formerly c7486f3952] [formerly 7b37c4d188] [formerly 6634a2df01 [formerly 7b37c4d188 [formerly 449f167ce1c30a595b4b673fc4d71658500e844d]]]]
Former-commit-id: 6634a2df01
Former-commit-id: 798c0a374b [formerly 1c0e5a7d35] [formerly b6372971169a46ceee886eb93b197f2eb2a02307 [formerly f1d31723c7]]
Former-commit-id: e7787f8d6c35139134890b743646bc30777cf924 [formerly c069dd338a]
Former-commit-id: 2d9e8e0553
|
2014-08-25 13:50:27 -05:00 |
|
Brian Clements
|
776781b39c
|
Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: 5d794a5135 [formerly 960eb2dc29] [formerly 4314f71387] [formerly 5d794a5135 [formerly 960eb2dc29] [formerly 4314f71387] [formerly cf671dcda8 [formerly 4314f71387 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]]]
Former-commit-id: cf671dcda8
Former-commit-id: cb34376804 [formerly 253b14b895] [formerly ad4290afd9237cad2ca05f14d0e5d7191bb86b8b [formerly f9756abf0a]]
Former-commit-id: 1fb9f395c099428c7cfe4498866fb60825fb08d7 [formerly 7bc93588a1]
Former-commit-id: 05bfc2943c
|
2014-08-25 13:34:36 -05:00 |
|
Nate Jensen
|
81796e4d08
|
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: 41a7e2dbcd [formerly 0852d804ba] [formerly 5e46c55a76] [formerly 41a7e2dbcd [formerly 0852d804ba] [formerly 5e46c55a76] [formerly d66ac29640 [formerly 5e46c55a76 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]]]]
Former-commit-id: d66ac29640
Former-commit-id: 702239de9f [formerly d824e365d1] [formerly 4fa0bfb69b17bae7253b0667ffaee25774b64820 [formerly 5c943c5ddc]]
Former-commit-id: d618491bf8793852bfbd3ec1383e25783451911a [formerly 18902f8c9a]
Former-commit-id: 6bb1e7d4bd
|
2014-08-25 13:12:46 -05:00 |
|
Ron Anderson
|
e41ef00e62
|
Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0
Former-commit-id: 0cb234d764 [formerly 56b553ad0d] [formerly 8434195c57] [formerly 0cb234d764 [formerly 56b553ad0d] [formerly 8434195c57] [formerly 606e2b210c [formerly 8434195c57 [formerly 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1]]]]
Former-commit-id: 606e2b210c
Former-commit-id: 512225160f [formerly 6c38d4f143] [formerly 7aabd59d0a6ed65868fcbace30e4217e4eef4d03 [formerly fda5c981f9]]
Former-commit-id: b36a094dd01554e3be1ec138023a4f1a30ab5895 [formerly 7799092b08]
Former-commit-id: eede0b99c3
|
2014-08-25 12:39:58 -05:00 |
|
Roger Ferrel
|
b3d2996e76
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: 20362833cf [formerly a610e0a34b] [formerly ca3a0595d2] [formerly 20362833cf [formerly a610e0a34b] [formerly ca3a0595d2] [formerly d0779ef059 [formerly ca3a0595d2 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]]]
Former-commit-id: d0779ef059
Former-commit-id: 248bd0a393 [formerly be7d387a4b] [formerly 1fd4b3451da3ccea875b5e6dc43fa6eacddc8994 [formerly cfe1212590]]
Former-commit-id: 745fe2a291852f43240cb02cd4c30d6024a6d7fa [formerly a9d8c8f3f5]
Former-commit-id: c534338504
|
2014-08-25 07:59:26 -05:00 |
|
Brian.Dyke
|
9a5fa53446
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: aecf73e71a [formerly a841eb53e5] [formerly a4376ec79f] [formerly aecf73e71a [formerly a841eb53e5] [formerly a4376ec79f] [formerly 0fbc5269ea [formerly a4376ec79f [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]]]]
Former-commit-id: 0fbc5269ea
Former-commit-id: f72c19fd3c [formerly caa50716ff] [formerly 6d6fe3691f712c1bf4868acb2bc3528ca639977e [formerly 13d523eede]]
Former-commit-id: 23276a6c95a3ff3542db1d52456372fdad964d1a [formerly 20c4fb88d5]
Former-commit-id: d9ac0d95d4
|
2014-08-22 16:40:51 -04:00 |
|
Brian.Dyke
|
272905b186
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: e348a6abc7 [formerly c8e9153884] [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b [formerly 1839b614df]]
Former-commit-id: 85ccff40908964b07fef1c572de049c609434728 [formerly cd1b914f50]
Former-commit-id: 27372f098c
|
2014-08-22 14:16:22 -04:00 |
|
Steve Harris
|
7a7e22ab95
|
Omaha #3368 - removing cave/hydro
Former-commit-id: 67432cb871 [formerly 8c66e2b895] [formerly 794208a255] [formerly 67432cb871 [formerly 8c66e2b895] [formerly 794208a255] [formerly 9cda8755c6 [formerly 794208a255 [formerly a232972763ef0dcbccd5d83b3841498f1b77b7aa]]]]
Former-commit-id: 9cda8755c6
Former-commit-id: d52408e0f8 [formerly 66b0e82582] [formerly e2b279d5d9d30a3618e923e7c8752b807f23e9cc [formerly d4862be8c6]]
Former-commit-id: 4f6eb89759b4005317f563ae16f56835da7d2234 [formerly a9c3fabb8b]
Former-commit-id: 4ee93b8fc1
|
2014-08-22 13:08:32 -05:00 |
|
steve.naples
|
51ad18da35
|
ASM #15664 Fixed issue with Tear Off menus not closing when perspective is closed, which caused an error.
Change-Id: If5fd120b7b34074686492d4cab9268ec1ac51a41
Former-commit-id: 5345a81859 [formerly 1bde9a4013] [formerly c2bb43944c] [formerly 5345a81859 [formerly 1bde9a4013] [formerly c2bb43944c] [formerly 7690281c5c [formerly c2bb43944c [formerly e719245823220d7b583ffdb0adc88c8b71321369]]]]
Former-commit-id: 7690281c5c
Former-commit-id: 6710f1b499 [formerly a3443402f2] [formerly 48f6372c443d2dc759583c40eb155abec6fa9133 [formerly 560cf97a6f]]
Former-commit-id: a68aaacc0437ee9a353afd856e130fb189e7f671 [formerly 162cba6657]
Former-commit-id: b0240d7710
|
2014-08-22 15:21:35 +00:00 |
|
Brian Clements
|
a87e344a27
|
Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent
Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2
Former-commit-id: d3f0f7dea4 [formerly bcc3e405e5] [formerly d62db22874] [formerly d3f0f7dea4 [formerly bcc3e405e5] [formerly d62db22874] [formerly 9f7905b58d [formerly d62db22874 [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]]]
Former-commit-id: 9f7905b58d
Former-commit-id: b5bc73c517 [formerly d2c4e847ba] [formerly d45fd23deea0c9c7a5c6f3243a512210f490288a [formerly 561977ecba]]
Former-commit-id: 3e55f9cbe722bd44a7ad79c1733b24c7add3f40e [formerly 29a7557a0c]
Former-commit-id: 930d64d738
|
2014-08-22 08:56:56 -05:00 |
|
Greg Armendariz
|
85ffd5992f
|
Merge "Omaha #3368 - Move ohd plugin to new repository" into omaha_14.4.1
Former-commit-id: 8f4b51779d [formerly b19a61cd10] [formerly 6370aaba96] [formerly 8f4b51779d [formerly b19a61cd10] [formerly 6370aaba96] [formerly b951f0e4eb [formerly 6370aaba96 [formerly 24376606c4974e3b22f120dac1c81a1752771ab1]]]]
Former-commit-id: b951f0e4eb
Former-commit-id: 11036ca7cf [formerly c2bfd6975f] [formerly b68af63c0fbc2371531634fe2beb13df96e09de9 [formerly 551e0a6a99]]
Former-commit-id: 9a73a67f9157f559d57ca9442fcd92682f741308 [formerly e84a38aeea]
Former-commit-id: d8e66d3d07
|
2014-08-22 08:06:13 -05:00 |
|
Steve Harris
|
96e8c6acb9
|
Omaha #3368 - Move ohd plugin to new repository
Former-commit-id: 849aac396b [formerly aec275dc31] [formerly 8c467a9fa5] [formerly 849aac396b [formerly aec275dc31] [formerly 8c467a9fa5] [formerly 28e88dfe7e [formerly 8c467a9fa5 [formerly 56dfed379b0e41c435a3226c3f02b9bc5232b4fd]]]]
Former-commit-id: 28e88dfe7e
Former-commit-id: 3817d55f4a [formerly 7542fda9a7] [formerly 6e302d243960bc6d456c0a8ce5cc4c8891246175 [formerly 675dbe0c21]]
Former-commit-id: 15f723fbc32e09f2baa8e6d7cb52f891299ff62a [formerly b5f3fe44ed]
Former-commit-id: 1d59bbc93f
|
2014-08-21 11:04:08 -05:00 |
|
Qinglu.Lin
|
90cab42717
|
ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b
Former-commit-id: bd03ec7a6f [formerly 3cc94603a2] [formerly fb92838427] [formerly bd03ec7a6f [formerly 3cc94603a2] [formerly fb92838427] [formerly 2157a4aa3b [formerly fb92838427 [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]]]
Former-commit-id: 2157a4aa3b
Former-commit-id: 2cde7ae918 [formerly 787f157850] [formerly 0f8e6a12a3a39382b7066fa24db8ef861b31c909 [formerly 3037a17366]]
Former-commit-id: b6f56818727e927936380f47630dfcdd4372ea9f [formerly 040e1071b2]
Former-commit-id: 77e6647de8
|
2014-08-21 10:43:22 -04:00 |
|
Ron Anderson
|
e957b37b5a
|
Omaha #1664 Fixed invalid thread access in several GFE dialogs
Change-Id: Ib40e6928c61a0f9e4f9fad9d8e7a06a66af292e3
Former-commit-id: cbb5d9302f [formerly a9d580647e] [formerly 4178dac741] [formerly cbb5d9302f [formerly a9d580647e] [formerly 4178dac741] [formerly bb124e7fa2 [formerly 4178dac741 [formerly 93aa457f4918cd16edd21422819cda12af26250f]]]]
Former-commit-id: bb124e7fa2
Former-commit-id: 3a66751078 [formerly ca2f709ce1] [formerly 5bbb2e79ae0e9484811156c4a769a4b70f2d3bee [formerly ff31c11e02]]
Former-commit-id: 4e320f8aa08746f98e8fd8ec758e45047cacc254 [formerly 1cabf1b3cd]
Former-commit-id: 8a9d464a81
|
2014-08-21 09:25:14 -05:00 |
|
Zihou Wang
|
acbfe1c1d5
|
VLab Issue #4464 - DR_17214 RADAR: NEXRAD Unit Status display problem due to the GSM change; fixes #4464
Change-Id: I0ca330e385000e04ef21142e75adfc55d4615a89
Former-commit-id: 4d1413888c [formerly dde3ee4904] [formerly 3ffac397db] [formerly 4d1413888c [formerly dde3ee4904] [formerly 3ffac397db] [formerly a2a2a8cdf9 [formerly 3ffac397db [formerly 288dc7c439995a8ab48680832b63f7d6974885b4]]]]
Former-commit-id: a2a2a8cdf9
Former-commit-id: 79a8578e66 [formerly 698321896d] [formerly f2f1588b1c6b769b07f0455787bd95832d5a280f [formerly 0785965b62]]
Former-commit-id: d1164f57476b696b329fdb6874a8a95d5fbaf063 [formerly a7a47a11ca]
Former-commit-id: 7c6cf0642f
|
2014-08-21 12:04:30 +00:00 |
|
Rici.Yu
|
ea21de81f0
|
ASM #15084 - check in files for DCS 25
Change-Id: I956d9f5175e8beb3d52db89035251add51973dda
Former-commit-id: 2edc04f27e [formerly 30aaafc702] [formerly ae581dc444] [formerly 2edc04f27e [formerly 30aaafc702] [formerly ae581dc444] [formerly e5c4562e83 [formerly ae581dc444 [formerly eb85d059b64d9c2a41014d8f1762a61e58a5226b]]]]
Former-commit-id: e5c4562e83
Former-commit-id: 7a89219ba0 [formerly da7fa2e13e] [formerly b5f37dc4fb6d6d2358aa65b479bc12064f9bbb8f [formerly 4f4e2b5b34]]
Former-commit-id: 2bdf3997e1aa199be8019b14f24d5558a78a0659 [formerly 318046e0a2]
Former-commit-id: 7da8b0ae36
|
2014-08-20 16:52:08 -04:00 |
|
steve.naples
|
9cbbecd30e
|
ASM #14807 Updated snow file parser in ReadSnowData to fix parsing issues.
Change-Id: I5182f2640baebbb0f5c6d66e5a3d81da7461af69
Former-commit-id: ccd7b7e2ad [formerly 765fa2dc4e] [formerly 179031d9b4] [formerly ccd7b7e2ad [formerly 765fa2dc4e] [formerly 179031d9b4] [formerly 4be6abad1b [formerly 179031d9b4 [formerly 67e36d96d0acaa8dfdf61164a5c66fbda9dd753b]]]]
Former-commit-id: 4be6abad1b
Former-commit-id: 82c2f494ab [formerly 57396fa455] [formerly 7855fd9b5ed6688a80c65ec137f9fc39406ae743 [formerly cb000115cb]]
Former-commit-id: 154bf57d993d152ab23cba2faed29a5a2514527d [formerly c9f3159b05]
Former-commit-id: 819ed0b12e
|
2014-08-20 17:17:14 +00:00 |
|
David Friedman
|
b970f9769c
|
ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f
Former-commit-id: 280f4a4b64 [formerly b053e1e2ce] [formerly 78ee5a56c5] [formerly 280f4a4b64 [formerly b053e1e2ce] [formerly 78ee5a56c5] [formerly 6a7638ddae [formerly 78ee5a56c5 [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]]]
Former-commit-id: 6a7638ddae
Former-commit-id: 4f3458f5fb [formerly 95fbbdf730] [formerly e0968bdffeb4e1072679ff80338a84d7bb82e1e9 [formerly 76d78ff72e]]
Former-commit-id: 2eb00233e833c805596310a628d40ea6515979a3 [formerly 2ce533f866]
Former-commit-id: 40c7d1971e
|
2014-08-20 14:13:32 +00:00 |
|
Slav Korolev
|
255c2b2b9e
|
Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761
This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly f4eec5a328 [formerly 55a1120bdb] [formerly dd9d117f90] [formerly f4eec5a328 [formerly 55a1120bdb] [formerly dd9d117f90] [formerly e5af41fa86 [formerly dd9d117f90 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]]].
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: 7c336276f4 [formerly 1c896cedab] [formerly a9bed4c6fd] [formerly 7c336276f4 [formerly 1c896cedab] [formerly a9bed4c6fd] [formerly a779c786f1 [formerly a9bed4c6fd [formerly aee044437492438381db98cc6fd3a917f6c05659]]]]
Former-commit-id: a779c786f1
Former-commit-id: 14193d9f0d [formerly d080af879e] [formerly 03e43cde864d9e501745b3af41e7db422c82dcbe [formerly 407be3d26f]]
Former-commit-id: 78f747829f22eb099862b93f26e70021a2f10294 [formerly 99a8258e86]
Former-commit-id: 9d0e31155f
|
2014-08-19 10:12:36 -05:00 |
|
Brian Clements
|
9c7f3d2d15
|
Issue #3542 fixed lightning count clipping issue
Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b
Former-commit-id: 7ac071e0f9 [formerly 9e33cf1f5f] [formerly 78796c3f6e] [formerly 7ac071e0f9 [formerly 9e33cf1f5f] [formerly 78796c3f6e] [formerly fc2e7f52b9 [formerly 78796c3f6e [formerly 937c656ba2a9fc98bfa5655a5020d470f83b898f]]]]
Former-commit-id: fc2e7f52b9
Former-commit-id: 3d2124d6b6 [formerly f6a9a13142] [formerly e9d6237b6b6767c71af55ba38a0ac6cee1547046 [formerly f593f8a78d]]
Former-commit-id: 56293337d6282f7f27849b7e92b089578f44eaca [formerly a087a5c028]
Former-commit-id: 9dacb7a696
|
2014-08-19 09:00:58 -05:00 |
|
Nate Jensen
|
7603661836
|
Merge "Issue #3497 refactored syntax check to prevent infinite loop possibility and apply some sanity" into omaha_14.2.4
Former-commit-id: bed1070749 [formerly 2ef19db3b7] [formerly f9036405d6] [formerly bed1070749 [formerly 2ef19db3b7] [formerly f9036405d6] [formerly 7c4a57e518 [formerly f9036405d6 [formerly fe105be09b018efb625194f692ae9686a898981e]]]]
Former-commit-id: 7c4a57e518
Former-commit-id: 324d7fef97 [formerly 06881679ba] [formerly 55f687ea863df8fd989ed866f405ab289588833f [formerly 438bcc8d90]]
Former-commit-id: 1922644539549669786a9658f7e36ecd98cf3019 [formerly 48b7c037e3]
Former-commit-id: 91ffebd905
|
2014-08-19 08:37:47 -05:00 |
|
Nate Jensen
|
7cda65b7fd
|
Merge "Issue #3500 added bundle loader synchronization" into omaha_14.2.4
Former-commit-id: 41639f767e [formerly 178236b9c7] [formerly 15b7d9a39b] [formerly 41639f767e [formerly 178236b9c7] [formerly 15b7d9a39b] [formerly f14b66d040 [formerly 15b7d9a39b [formerly 20431b0b036c3386f0f471887ebaeac5940463e4]]]]
Former-commit-id: f14b66d040
Former-commit-id: 7119d246b8 [formerly d0d0ecc38e] [formerly 7b7cdb5a32c24003afeac5f915d3b04313573383 [formerly b6d5713123]]
Former-commit-id: 27e10f744e1a5c9b5cf026114507cb1fb830f8a0 [formerly 047220f290]
Former-commit-id: 9d79e2ae12
|
2014-08-19 08:37:35 -05:00 |
|
Robert Blum
|
5f56a1291e
|
Omaha #3453 Added the spell check dictionary to site level localization.
Former-commit-id: d002075985 [formerly 2ae87df58a] [formerly 9d754dc57a] [formerly d002075985 [formerly 2ae87df58a] [formerly 9d754dc57a] [formerly 5ddadc2015 [formerly 9d754dc57a [formerly f561e979ad047319c6c7f12cf13633868ed9edea]]]]
Former-commit-id: 5ddadc2015
Former-commit-id: 641b713bc4 [formerly f9cafb2d51] [formerly 6c0ec0e604926d50ebdc4cce4cac9d69b2cada60 [formerly bf4fc92db1]]
Former-commit-id: 57addafd72b434d5035291d6ef5291f88b6e219d [formerly fe5666a502]
Former-commit-id: bf291978f0
|
2014-08-18 15:09:30 -05:00 |
|
Brian.Dyke
|
ecc4712f43
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR - LevelMappingFile.xml
Former-commit-id: 52a47dc75e [formerly 0c10dc2ee0] [formerly f52f2b1c25] [formerly 52a47dc75e [formerly 0c10dc2ee0] [formerly f52f2b1c25] [formerly aa6e025b14 [formerly f52f2b1c25 [formerly 93c1663761e65e870262bc4fdf4028b08e20c85a]]]]
Former-commit-id: aa6e025b14
Former-commit-id: fcd4547980 [formerly 331cb68011] [formerly a07800fc1b67b4770818ec101baec2aa41e12fbd [formerly 02e1b34afb]]
Former-commit-id: 229fabb52fb449b33231402cc98cd6beefb21214 [formerly 19fa7abdc0]
Former-commit-id: 5f3b50a3c9
|
2014-08-18 14:18:05 -04:00 |
|
Nate Jensen
|
0acf5f4d50
|
Merge "Omaha #3356 export collaboration radar package so serialization can detect it" into omaha_14.4.1
Former-commit-id: 8de98a88a6 [formerly 45250011ca] [formerly 6ce1412ba7] [formerly 8de98a88a6 [formerly 45250011ca] [formerly 6ce1412ba7] [formerly beade19cff [formerly 6ce1412ba7 [formerly c2be8077792e13bedd6051fb53b51fb651ad63b9]]]]
Former-commit-id: beade19cff
Former-commit-id: 1a77d1f7c7 [formerly 5f2537292e] [formerly ec16d370e299e4b5ec146726b88fe11e2f61b7b5 [formerly 56aae11b43]]
Former-commit-id: 1331c77f9303b471f68e464fe4c03858d102dc9d [formerly 64f9047718]
Former-commit-id: 219df2cb2b
|
2014-08-15 15:39:50 -05:00 |
|
Nate Jensen
|
8aed72c00d
|
Omaha #3356 export collaboration radar package so serialization can detect it
Change-Id: I69b49ce7ec0a616bfb91d5a4e784d889526e04ae
Former-commit-id: 0459a7e0f1 [formerly 0a5d552ef4] [formerly ac1f0963f9] [formerly 0459a7e0f1 [formerly 0a5d552ef4] [formerly ac1f0963f9] [formerly 82a0c85bca [formerly ac1f0963f9 [formerly c989377ccd931e5414cfdffeca111a1714a7ce42]]]]
Former-commit-id: 82a0c85bca
Former-commit-id: bcd9aad09e [formerly 7e8ad87ec5] [formerly 39fb4d976f261efbc66f2fc8a93c6ed011322fad [formerly 4b969012f8]]
Former-commit-id: 7674357afdfa149cb880f2e9be0d00c462ed46d3 [formerly 8cb4cee7c9]
Former-commit-id: 429fa9cb17
|
2014-08-15 15:27:22 -05:00 |
|
Brian Clements
|
2c00846266
|
Omaha #3522 geotiff resources uses TileSetRenderable
Change-Id: I6f7bf69edb2f696847d44323511c0de219b96852
Former-commit-id: 166cd7fde2 [formerly 3129f1032b] [formerly 18b9be2315] [formerly 166cd7fde2 [formerly 3129f1032b] [formerly 18b9be2315] [formerly b6106ae8cd [formerly 18b9be2315 [formerly 9514da9d0aed2e2446412dad9f201642288e6aae]]]]
Former-commit-id: b6106ae8cd
Former-commit-id: 4677b4cd21 [formerly 5900c541f3] [formerly 0b369d09d8471c36a8c8493724b74e349211b7c4 [formerly 313fb831f8]]
Former-commit-id: ae07e38f743a694206362d7df17d35e0ff89c1b4 [formerly 047cda7a8a]
Former-commit-id: e6630fcce7
|
2014-08-15 15:19:22 -05:00 |
|
Nate Jensen
|
b69c4ce511
|
Omaha #3535 bigger inset map point on time series
Change-Id: I61a8eba411c49144422f300cca3d2df45b4ebf02
Former-commit-id: b3cfb7e08a [formerly 9cb8224548] [formerly c7add218fc] [formerly b3cfb7e08a [formerly 9cb8224548] [formerly c7add218fc] [formerly 84e99f7367 [formerly c7add218fc [formerly 552b1309c5a9665db3eac75235f202245cb9a76e]]]]
Former-commit-id: 84e99f7367
Former-commit-id: ad96607663 [formerly 572941474f] [formerly a017ca34ec3e583e3dfabd60f8a7572fdde848ec [formerly e3d81c507d]]
Former-commit-id: 1ff4d695aeec7fb6e8d81ff64cb0621b8e446c2d [formerly e8ae8e5967]
Former-commit-id: 4a1226eec5
|
2014-08-15 11:27:03 -05:00 |
|
Zihou Wang
|
a6e7bd5fae
|
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce
Former-commit-id: d71def2617 [formerly 2fd6278cf3] [formerly e9f78d8f52] [formerly d71def2617 [formerly 2fd6278cf3] [formerly e9f78d8f52] [formerly f54da5f6ae [formerly e9f78d8f52 [formerly f61e935c0372ee19768f2080da1f8fa21fb9aeb1]]]]
Former-commit-id: f54da5f6ae
Former-commit-id: d88eba846f [formerly cac176920d] [formerly 8e188c48a6b64c228ad8f7ee3d55a6814a9e87a5 [formerly 065f2d9996]]
Former-commit-id: 27642fe140d1a84db5df0745cc1a89b25dfda084 [formerly 11e5523112]
Former-commit-id: e222fa4eda
|
2014-08-15 11:04:39 -05:00 |
|
Ana Rivera
|
eff21cac5d
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 2f13aed851 [formerly 11073fdece] [formerly 9ada9356c5] [formerly 2f13aed851 [formerly 11073fdece] [formerly 9ada9356c5] [formerly 4c585af933 [formerly 9ada9356c5 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]]]
Former-commit-id: 4c585af933
Former-commit-id: 1c9c634cbd [formerly 706336e633] [formerly 0a133cea945d17da6363d9f19082865a41af0dc3 [formerly b5e6172652]]
Former-commit-id: 8c09880e14992eb3d51f00d57659cc59ea79b21d [formerly 80a0799f46]
Former-commit-id: 15b766c9f5
|
2014-08-15 11:04:23 -05:00 |
|
Ana Rivera
|
27b8eeca07
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0a812a313d [formerly 1daa44291e] [formerly a44d5d91db] [formerly 0a812a313d [formerly 1daa44291e] [formerly a44d5d91db] [formerly 9bf2df23be [formerly a44d5d91db [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]]]
Former-commit-id: 9bf2df23be
Former-commit-id: 6c6efd68c0 [formerly c294608c37] [formerly 0dfe16e83678d27d979861133a85a641c588b678 [formerly eefe73ee51]]
Former-commit-id: 35a0a95e45117d91938da4179d30084369566fbe [formerly 4b42e52ce3]
Former-commit-id: 0ff1ac5357
|
2014-08-15 11:02:36 -05:00 |
|