Commit graph

211 commits

Author SHA1 Message Date
Richard Peter
0a55bcfd67 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06 [formerly 79ef100838] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d]
Former-commit-id: e838f2db25
2013-01-14 18:07:17 -06:00
Steve Harris
e5f32a2bbe 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5 [formerly e34695538d] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275]
Former-commit-id: b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
031bae3bfd Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd [formerly fa6247baf7] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917]
Former-commit-id: ef2dc06b69
2013-01-14 17:38:38 -06:00
Steve Harris
32c48861de 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987 [formerly 7d0109a349] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2]
Former-commit-id: 92f1e9416c
2013-01-11 16:19:07 -05:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
db5990243a Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]]
Former-commit-id: ce72ebb094
Former-commit-id: 88f9070c93 [formerly 15849ae72a] [formerly 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]]
Former-commit-id: 90d18a302d7bff79b3ebe72d11d8f08efc5f661a [formerly db24093e42]
Former-commit-id: 868acb808b
2012-12-11 08:56:54 -06:00
Steve Harris
179755f156 Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4]
Former-commit-id: b0a60923c4
2012-12-11 08:45:53 -06:00
Max Schenkelberg
68ab110a18 Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw
Change-Id: I8207e9e3082db861c8040858ef11dc67e63747da

Former-commit-id: 9ed56d2a16 [formerly 72f31d5f0c] [formerly d833d917db] [formerly 9ed56d2a16 [formerly 72f31d5f0c] [formerly d833d917db] [formerly d7c9ac3b84 [formerly d833d917db [formerly ba1d1a6bfe57466a6a0fe5864cd87ffefe61a2f8]]]]
Former-commit-id: d7c9ac3b84
Former-commit-id: 0950126c48 [formerly d0e091312a] [formerly b7f1408e11e1d131d4a8f3404d8ff6a088ea47fd [formerly e27d415da5]]
Former-commit-id: 640eddb6b3bdd325d525eeba62ec3457b59270fe [formerly 1fbb76abfd]
Former-commit-id: 40f67f7e54
2012-12-07 11:44:46 -06:00
Ron Anderson
464ceb1658 Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly b6fcd999f4 [formerly bb163074fa [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]]]
Former-commit-id: b6fcd999f4
Former-commit-id: 7c09ef9001 [formerly c5b3111795] [formerly a37aae4d7e209290f67a1eb565eee632c0e19fd2 [formerly 70cca3900b]]
Former-commit-id: 341f47a5a9d882b376fc4121ea445322390c9a2b [formerly 111c0495a4]
Former-commit-id: b02f3a733f
2012-12-06 17:02:56 -06:00
Max Schenkelberg
5d14a6278a Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type
Change-Id: I71f9f9b23573394e9f98895164be4aef659ec02a

Former-commit-id: f9f8c75b79 [formerly 5693e567ef] [formerly 032b0948a4] [formerly f9f8c75b79 [formerly 5693e567ef] [formerly 032b0948a4] [formerly 2e1bb4f7c6 [formerly 032b0948a4 [formerly a4c781a6c57579f04413dc16a0b3937ac6ce72d4]]]]
Former-commit-id: 2e1bb4f7c6
Former-commit-id: 71d34ca33a [formerly 8974e33edc] [formerly bdf52e73976551873e82686836572d9d03b9024c [formerly 2e51e024b8]]
Former-commit-id: d9a18c713e9dd5823199b0d8f70a56e945947ee0 [formerly 37b94ec835]
Former-commit-id: d47f34fb45
2012-12-06 11:23:22 -06:00
Steve Harris
cedbde75e3 12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 79b0e973ef [formerly 69ab975fab] [formerly 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]]
Former-commit-id: 54c80ccffc60d6ee8a544b475ed12355b32a2f26 [formerly 190378beeb]
Former-commit-id: f8a9ae24cb
2012-12-06 09:18:28 -06:00
Steve Harris
25facfa9a7 12.12.1-10 baseline
Former-commit-id: 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]]
Former-commit-id: 28018b8d9b
Former-commit-id: d2da55254b [formerly 8a41d325d2] [formerly e0830ae197e0ce5e3085d3fffa18fe7132792d42 [formerly 0c67cb78a3]]
Former-commit-id: b37b8565f1ec8f0e35f587d2337f734e0608c210 [formerly 8ada406bfe]
Former-commit-id: a10d7d3041
2012-12-06 09:12:15 -06:00
Max Schenkelberg
0a1a51c6ef Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation
Amend: Fixed time matcher index error when no data is available in GFE

Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5

Former-commit-id: a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly 1328deac56 [formerly 624cafb066 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]]]
Former-commit-id: 1328deac56
Former-commit-id: c9f3a07ac0 [formerly 47c7518388] [formerly b86ec7c1b619648b5b662c8f776712e299e94036 [formerly c5536a9a84]]
Former-commit-id: 53e8d333e59bfe0fb923f0e1ef352a70cc918e0d [formerly b1c2bf1cc4]
Former-commit-id: a488900f51
2012-11-30 14:17:50 -06:00
Roger Ferrel
cfe190d1a7 Issue #1298 Plugin changes to get localization import of files to work for test procedures.
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d

Former-commit-id: 3e7d2cc03c [formerly ac09c59d38] [formerly 2a1024ff50] [formerly 3e7d2cc03c [formerly ac09c59d38] [formerly 2a1024ff50] [formerly 230e24addc [formerly 2a1024ff50 [formerly 67b55ee03d17a878375be75bc36bcb5500ca98fd]]]]
Former-commit-id: 230e24addc
Former-commit-id: 588a4f7da3 [formerly 0011eb0ff4] [formerly b6c45933b44d7827fbc20bcfd0aa6e32b0594cee [formerly ea3b2aebc6]]
Former-commit-id: a51946ac8b8444c59ae1a309dcaf09482cfb124a [formerly 2cc1b72f9e]
Former-commit-id: bb21c0b2f7
2012-11-27 10:37:06 -06:00
Roger Ferrel
1434078488 Issue #1298 Changes for non-blocking SelectionDlg.
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b

Former-commit-id: 3087efb2e0 [formerly 5f3fab4677] [formerly 00693d83bb] [formerly 3087efb2e0 [formerly 5f3fab4677] [formerly 00693d83bb] [formerly 59181213a0 [formerly 00693d83bb [formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]]]
Former-commit-id: 59181213a0
Former-commit-id: c2ccf9dd90 [formerly d0cdc594f8] [formerly c9f30770363ef819d269136eb35a07599220439c [formerly fdfcb2ebea]]
Former-commit-id: 450d4e6ceac61771c28c73b3f3337fb38ef4d012 [formerly e424cb4bf2]
Former-commit-id: 619197cbb2
2012-11-15 12:55:49 -06:00
Roger Ferrel
95711528ad Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455

Former-commit-id: 8cce309a6e [formerly fc87eccb77] [formerly a6fdc7b580] [formerly 8cce309a6e [formerly fc87eccb77] [formerly a6fdc7b580] [formerly acf1881cb7 [formerly a6fdc7b580 [formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]]]
Former-commit-id: acf1881cb7
Former-commit-id: 4b6c5bc2d3 [formerly 8881e4d3ec] [formerly 092e0c8e86fd9af48cdabc168fe255b8d961546d [formerly d6c5839e0e]]
Former-commit-id: 8753a2bf60a5a6a69df5eac63b7ac9f764b8df27 [formerly 265adb9b1c]
Former-commit-id: aeb27b3c88
2012-11-14 16:33:27 -06:00
Lee Venable
11fff1b8a9 Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
Former-commit-id: 2c82bf1184 [formerly 6152ecccda] [formerly 695cf85335] [formerly 2c82bf1184 [formerly 6152ecccda] [formerly 695cf85335] [formerly 6134e5d3f7 [formerly 695cf85335 [formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]]]
Former-commit-id: 6134e5d3f7
Former-commit-id: e32f3dec10 [formerly d82072b975] [formerly 5f410f0507be8de6ebdea359793b084ce6d0667a [formerly 7ed335793f]]
Former-commit-id: fd8ba36786cde6648c7dcd2507759b25826950f3 [formerly 3369913a84]
Former-commit-id: f3cf44ffb4
2012-11-14 16:06:02 -06:00
Roger Ferrel
cfd0219849 Issue #1298 Changes for non-blocking DisplayAttributesDialog.
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d

Former-commit-id: 08919ea541 [formerly 82f9c74bef] [formerly 7ca75756ae] [formerly 08919ea541 [formerly 82f9c74bef] [formerly 7ca75756ae] [formerly 212045c1a6 [formerly 7ca75756ae [formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]]]
Former-commit-id: 212045c1a6
Former-commit-id: 27b63206b7 [formerly 7f33d6ba18] [formerly fe1b8540deb8623751c11b171ed8881812641aa8 [formerly d069f186e1]]
Former-commit-id: 595a95d4a2e9268a01bcd2a146917008b3ea53c6 [formerly 9cf45444c3]
Former-commit-id: 9a04b3847b
2012-11-14 14:56:42 -06:00
Roger Ferrel
d886446fd8 Issue #1298 Changes for non-blocking TEWxSetValueDialog.
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b

Former-commit-id: cac846718a [formerly 679d967382] [formerly 7f22145bf2] [formerly cac846718a [formerly 679d967382] [formerly 7f22145bf2] [formerly dd8f8a9fa7 [formerly 7f22145bf2 [formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 086f464e38 [formerly 56ed69fc83] [formerly 9c581c148e8a0d69f42133e580578c5ccbd32780 [formerly 89653eb5e1]]
Former-commit-id: 789d2bb255666f1d1de0f8dd7cc54d54cc11ef0e [formerly eb20af7237]
Former-commit-id: 52425e6b99
2012-11-14 14:20:40 -06:00
Roger Ferrel
3da9e354ef Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8

Former-commit-id: a49ee93898 [formerly 62faa06ddf] [formerly e267248b57] [formerly a49ee93898 [formerly 62faa06ddf] [formerly e267248b57] [formerly 2331b8e1f5 [formerly e267248b57 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]]]
Former-commit-id: 2331b8e1f5
Former-commit-id: 33cd82df5c [formerly ce623db367] [formerly f3b0d96220d8990a788ce98360553eaaec46477f [formerly 3f0dc83f89]]
Former-commit-id: f8a232315a21dff3d1fc6aebae60af3f68f041c1 [formerly 55b052c849]
Former-commit-id: 51b30ca9b5
2012-11-14 14:02:01 -06:00
Lee Venable
9ea463500b Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
Former-commit-id: 68a58d808a [formerly a6e88a6856] [formerly e755889643] [formerly 68a58d808a [formerly a6e88a6856] [formerly e755889643] [formerly e9ae25e781 [formerly e755889643 [formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]]]
Former-commit-id: e9ae25e781
Former-commit-id: 0f3fb27af1 [formerly 680373301f] [formerly 298e4f53220a5c54f7602fa97c954e24234058eb [formerly 09591687a9]]
Former-commit-id: 1403991e984897e87d6f3d04391b121fc1204131 [formerly 9cbd7cdcbe]
Former-commit-id: 12e2e49950
2012-11-14 13:30:42 -06:00
Roger Ferrel
2f56256eb8 Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072

Former-commit-id: a8453f1f81 [formerly 7f3d893c84] [formerly d16a448e05] [formerly a8453f1f81 [formerly 7f3d893c84] [formerly d16a448e05] [formerly 590eca2cba [formerly d16a448e05 [formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]]]
Former-commit-id: 590eca2cba
Former-commit-id: f954d3dbe5 [formerly 78422d9893] [formerly 8bfed4f98086bca15c0c91bc03d65765d14477ce [formerly 950300e16d]]
Former-commit-id: 5109692e005e1bf78b156e94f1028cd351020468 [formerly a39abc035b]
Former-commit-id: 51e6ed0bcb
2012-11-14 12:04:18 -06:00
Roger Ferrel
a19864da10 Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
Changes from reviewer comments.

Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac

Former-commit-id: 4424131662 [formerly 5e805da0e1] [formerly 049ecefe1d] [formerly 4424131662 [formerly 5e805da0e1] [formerly 049ecefe1d] [formerly b32480ed08 [formerly 049ecefe1d [formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]]]
Former-commit-id: b32480ed08
Former-commit-id: ffefe1fe90 [formerly be24ca5ed6] [formerly 488a54e8e90966466526378b7880051a98a03d8f [formerly af0ad0433b]]
Former-commit-id: 1a8432622a51776a62fa26692467b1aa2e8e42ff [formerly bdeb05acbb]
Former-commit-id: d5e0266a5e
2012-11-14 11:36:52 -06:00
Steve Harris
b5fd6ed2fd Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]]
Former-commit-id: 00f3d51546
Former-commit-id: 98670f1cc2 [formerly 21ecd53719] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]]
Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217]
Former-commit-id: ae9d9985cd
2012-11-13 17:28:50 -06:00
Steve Harris
9e4dbe2640 12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401 [formerly 111e7607cf] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5]
Former-commit-id: 53d74c66e7
2012-11-13 17:14:24 -06:00
Lee Venable
1716ce4706 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 4320165247 [formerly 2827143110] [formerly 989d5dc5e4] [formerly 4320165247 [formerly 2827143110] [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 989d5dc5e4 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]]
Former-commit-id: dbdfda1d04
Former-commit-id: 4c936e9bb8 [formerly 77af9b8699] [formerly a654acdd7cf3477fb8a44e9b6bf136dee6be7b3d [formerly 282e8858da]]
Former-commit-id: 39a32350f8aad475612690d01a1181af0a42bb21 [formerly 5f79e0f562]
Former-commit-id: 4353b75410
2012-11-13 16:02:05 -06:00
Steve Harris
ccddf90d74 Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 5569785336 [formerly 1f1659cb16] [formerly 63b0f18a89] [formerly 5569785336 [formerly 1f1659cb16] [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly 63b0f18a89 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]]
Former-commit-id: 5c23f057b3
Former-commit-id: 7abc2601da [formerly 6db07e2e5e] [formerly b9c2ea0185e67881a053d4f784a50c258b57989c [formerly 1e0ad343d6]]
Former-commit-id: 5b2963e196fa2df8ead47999d773eb0a16ae2a62 [formerly 07abe90d1c]
Former-commit-id: 81015f6f41
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
b57a30d18d Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]]
Former-commit-id: e8090e654b
Former-commit-id: fa599c93a8 [formerly 109ec1e778] [formerly 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]]
Former-commit-id: 1922ebb0208920ac3ef27814907ade54d1a0244a [formerly 7761060a12]
Former-commit-id: 9f2f2591ee
2012-11-13 16:00:19 -06:00
Roger Ferrel
2ad77ad5af Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: f9265a7f55 [formerly cbacc77367] [formerly 1d5bd95866] [formerly f9265a7f55 [formerly cbacc77367] [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 1d5bd95866 [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]]
Former-commit-id: dceb2cde5d
Former-commit-id: 12ad9f9732 [formerly c498e21b23] [formerly 064d919288c957d602a2f2cbce59be833dac3237 [formerly 29eb436b19]]
Former-commit-id: 1d576bb378acf793b8153df70fc725f7aa86fb57 [formerly 0b8ecada1b]
Former-commit-id: de65e19817
2012-11-13 15:53:03 -06:00
Roger Ferrel
318a56771a Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 9ec6ee1fe4 [formerly 6f6b9dd21a] [formerly 1e8dfdc857] [formerly 9ec6ee1fe4 [formerly 6f6b9dd21a] [formerly 1e8dfdc857] [formerly b421a30116 [formerly 1e8dfdc857 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]]
Former-commit-id: b421a30116
Former-commit-id: dce9814cc7 [formerly 1272837397] [formerly 9fb3810dd061a915575be1fa8b5d2e12821cf89c [formerly d646f32d6e]]
Former-commit-id: 598844707b6924bafba9f9d28c39f879556aa343 [formerly 3eb1da1b66]
Former-commit-id: 295c73d59e
2012-11-13 13:20:28 -06:00
Roger Ferrel
fa64ad879e Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.

Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f

Former-commit-id: e82a2e2d5c [formerly fdfa0f2030] [formerly 5ce67ffd9e] [formerly e82a2e2d5c [formerly fdfa0f2030] [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 5ce67ffd9e [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]]
Former-commit-id: ae52206cc7
Former-commit-id: e4283e3ccd [formerly 122a5cf0a4] [formerly e30f66c230e0ca09d4cf1ce286c67a28b4b91763 [formerly 30c70cc181]]
Former-commit-id: 3709ef12351e9d79d8edef04d9bb2919d7e91d9d [formerly d31e866744]
Former-commit-id: 58dc77407c
2012-11-13 09:49:16 -06:00
Roger Ferrel
25370d4e80 Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly e982c0f43a [formerly 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]]
Former-commit-id: e982c0f43a
Former-commit-id: 4f08c126b6 [formerly 3b07bb1ae6] [formerly bad97768d4ebf7b70752c8307f99e51df3dd9fe0 [formerly de21a3f2ef]]
Former-commit-id: 2f7bf56cdf35e135b2334c51978e89aa272307ed [formerly d9c7c4ae56]
Former-commit-id: 3bc3bf17fd
2012-11-12 16:27:08 -06:00
Roger Ferrel
9fe8203d77 Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.

Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f

Former-commit-id: e6030885a1 [formerly 13c0fb3f3d] [formerly 6445081aa9] [formerly e6030885a1 [formerly 13c0fb3f3d] [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 6445081aa9 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]]]
Former-commit-id: 76109f3bf7
Former-commit-id: 4a8b71a632 [formerly 01899535e3] [formerly d744cdfac526c0ce2d581c461d6fbaafbdfaa2c9 [formerly e7cd99ff0d]]
Former-commit-id: 87078a296e6b644d33870f062f02c134e7e2f190 [formerly 3ebaaa8992]
Former-commit-id: a3608d98fd
2012-11-12 15:26:03 -06:00
Roger Ferrel
16a23467c4 Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5

Former-commit-id: 499100c5b6 [formerly 6ec9c1fac4] [formerly 9c9a068908] [formerly 499100c5b6 [formerly 6ec9c1fac4] [formerly 9c9a068908] [formerly f48474fc82 [formerly 9c9a068908 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]]]
Former-commit-id: f48474fc82
Former-commit-id: 0ff9252024 [formerly 398f71471d] [formerly bd145bd7ef91d95a7d99e1c2c708c0288c079123 [formerly b11413b7f0]]
Former-commit-id: ed15417823f2dbb45b3e4174ea8470994e981549 [formerly 6b0c3820d8]
Former-commit-id: 577c2b88ab
2012-11-12 14:22:02 -06:00
Lee Venable
fd08ca5acc Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: ca20167d7e [formerly 72aedbcece] [formerly ab62adea95] [formerly ca20167d7e [formerly 72aedbcece] [formerly ab62adea95] [formerly 7db247e33a [formerly ab62adea95 [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]]]
Former-commit-id: 7db247e33a
Former-commit-id: 9715b63d07 [formerly 6ab3480255] [formerly f8b76144c6d9b8fab6faf09c7b74e630b40f12eb [formerly ded0bfb92f]]
Former-commit-id: 20006ac6ea0e775bf7a0df1f7b8087773eb18621 [formerly 92063028bc]
Former-commit-id: b02aebcfad
2012-11-12 14:13:06 -06:00
Lee Venable
2769b8cfb8 Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: 6359f32b18 [formerly d9022d16a6] [formerly 879078484e] [formerly 6359f32b18 [formerly d9022d16a6] [formerly 879078484e] [formerly 62c42850e8 [formerly 879078484e [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]]]
Former-commit-id: 62c42850e8
Former-commit-id: 65e6121178 [formerly 2b1be166a2] [formerly 1f8212cdab972e8581982c2fcbe3c6e04bac34f3 [formerly 4f26da9a9a]]
Former-commit-id: e350492e0ee7b6fe0757eb5ae8e74055fcda1128 [formerly 0a39d42de1]
Former-commit-id: 19bf7ac8aa
2012-11-12 14:09:44 -06:00
Roger Ferrel
0815987920 Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d

Former-commit-id: 5ea786daaf [formerly ce6d6e277e] [formerly 3676829e8f] [formerly 5ea786daaf [formerly ce6d6e277e] [formerly 3676829e8f] [formerly ee323d9c60 [formerly 3676829e8f [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]]]
Former-commit-id: ee323d9c60
Former-commit-id: fe965f064e [formerly 88968c54e5] [formerly 43f3c54726102723a37b2f0b8b134e1f63f433fd [formerly 73d9e78e92]]
Former-commit-id: bef14f1fdcf05155d7ff267062b13a14b0473b34 [formerly 4f86b0b521]
Former-commit-id: d3eda170ed
2012-11-12 13:20:05 -06:00
Roger Ferrel
97ddd8da5b Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a

Former-commit-id: dde8ce56c0 [formerly 1f509c5a54] [formerly 30ef939e3c] [formerly dde8ce56c0 [formerly 1f509c5a54] [formerly 30ef939e3c] [formerly 438731ca2e [formerly 30ef939e3c [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]]]
Former-commit-id: 438731ca2e
Former-commit-id: 5e77bcf8bd [formerly 8490814573] [formerly 3a0ae83fcc9d5bbb65ad3b13ffe372cc97db6e13 [formerly 195d876753]]
Former-commit-id: 8bf88cd2569f48497094f5687e8b29ee0842b0f2 [formerly df5b8485c6]
Former-commit-id: f5343fae99
2012-11-12 12:00:03 -06:00
Roger Ferrel
91e47f49aa Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
Changes from reviewer's comments.

Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079

Former-commit-id: 259949bc5f [formerly b60cbeda7a] [formerly d89ce26aeb] [formerly 259949bc5f [formerly b60cbeda7a] [formerly d89ce26aeb] [formerly d489a7ef9f [formerly d89ce26aeb [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]]]
Former-commit-id: d489a7ef9f
Former-commit-id: 2916b0a3b8 [formerly ecba7301a1] [formerly 8767fadd2a0a8ed1a13ec17c8ffe7adca41ac200 [formerly e01a4ae243]]
Former-commit-id: 280f44f50ca572fc6a52526bf07eaa615dc5f1be [formerly 26afb7f186]
Former-commit-id: e1bf6814d8
2012-11-12 07:14:15 -06:00
Roger Ferrel
4aeb7fd6d3 Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba

Former-commit-id: fb742c6dbf [formerly 709798659d] [formerly e26b14a84d] [formerly fb742c6dbf [formerly 709798659d] [formerly e26b14a84d] [formerly 89617dda68 [formerly e26b14a84d [formerly a2a52b7754d831406e591763930f419def7cb1eb]]]]
Former-commit-id: 89617dda68
Former-commit-id: ddeecc6e98 [formerly 553344fb3b] [formerly 905e3bb90604a5bd868eee7dd06299aedc0f819f [formerly 05825bd6f3]]
Former-commit-id: b5165931eb57a4fadceb017392a53e8e879158a7 [formerly f13bedab32]
Former-commit-id: e3b4a7d750
2012-11-08 11:19:51 -06:00
Lee Venable
b24d461c8d Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: 72972d37b7 [formerly 6c0bb76679] [formerly be460c956e] [formerly 72972d37b7 [formerly 6c0bb76679] [formerly be460c956e] [formerly e791e73a30 [formerly be460c956e [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]]]
Former-commit-id: e791e73a30
Former-commit-id: 40c27a2403 [formerly 1e61d4bd08] [formerly 7998fddf765b511c29eef50d418b778e580e742f [formerly 7b5f085643]]
Former-commit-id: b8dfecdcf985598d2b3b7bb6282c85fef8b7df6e [formerly b3991fa4c9]
Former-commit-id: 2f390bd372
2012-11-08 11:11:15 -06:00
Lee Venable
8e85bbad3e Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: fae33021a4 [formerly c4526c5ba0] [formerly ff5083715b] [formerly fae33021a4 [formerly c4526c5ba0] [formerly ff5083715b] [formerly c44f90f675 [formerly ff5083715b [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]]]
Former-commit-id: c44f90f675
Former-commit-id: b1b2512819 [formerly 9523ad6085] [formerly 0f61b7daa2e57b5bf03170e39269f6b4fa2377a4 [formerly 4a22ded443]]
Former-commit-id: be37ba43b25491e7af4571b70fb7f2031ae1ad99 [formerly 3bdfe02fe3]
Former-commit-id: 4329af5cea
2012-11-08 10:57:45 -06:00
Roger Ferrel
91cbd20ccc Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f

Former-commit-id: 853a3e6593 [formerly 359ee69fa6] [formerly dfb55edb3d] [formerly 853a3e6593 [formerly 359ee69fa6] [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly dfb55edb3d [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]]]
Former-commit-id: eae8a68fd5
Former-commit-id: 3851d5161c [formerly e7aa940f52] [formerly 0211367abde3087618fb2170a6c9b3664254ca94 [formerly 24a2e79b28]]
Former-commit-id: 410107753569223f9d35b6fd82a686616658272c [formerly 062109f9a7]
Former-commit-id: b895611562
2012-11-08 10:54:41 -06:00
Roger Ferrel
f57f694b63 Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef

Former-commit-id: c44dd45f87 [formerly 3ad0d7d516] [formerly 023252fb84] [formerly c44dd45f87 [formerly 3ad0d7d516] [formerly 023252fb84] [formerly c3f451f799 [formerly 023252fb84 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]]]
Former-commit-id: c3f451f799
Former-commit-id: 7bd36bb2c7 [formerly 9a1283fb1e] [formerly 9bc5add0937b47a44fcc72985df13d60bf528a0c [formerly de534f5b43]]
Former-commit-id: b208c9f9303fd4a49e76687d5d29d7b62b00e4c8 [formerly bf4c19927c]
Former-commit-id: eea2a76c7f
2012-11-08 08:24:38 -06:00
Roger Ferrel
787f9b6278 Issue #1298 Chnages for non-blocking FindReplaceDlg.
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7

Former-commit-id: 4aafcb8311 [formerly 94a4440625] [formerly 76f60240c5] [formerly 4aafcb8311 [formerly 94a4440625] [formerly 76f60240c5] [formerly 199475f671 [formerly 76f60240c5 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]]]
Former-commit-id: 199475f671
Former-commit-id: 66a19a85b3 [formerly c1d0b744b2] [formerly 40d79f26c493b7dacab3299f8b6b97602b46386e [formerly e072532a77]]
Former-commit-id: f909632659ffcd3cb6769219079a19d901505943 [formerly 3aa144b2df]
Former-commit-id: 056dbf2fb3
2012-11-08 07:57:56 -06:00
Lee Venable
263fa461c1 Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: dbeb600e58 [formerly c8955b5425] [formerly 36c44db46b] [formerly dbeb600e58 [formerly c8955b5425] [formerly 36c44db46b] [formerly 8956718961 [formerly 36c44db46b [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]]]
Former-commit-id: 8956718961
Former-commit-id: ddd96f4552 [formerly 15842d7d22] [formerly b323e3bf5eafbd091abc62b049b1e38dec9c47bc [formerly eacc1ca32c]]
Former-commit-id: 053f6922c519820f3a8948f94169b5b5dfa99a64 [formerly 139ca20a3c]
Former-commit-id: 374a019df4
2012-11-07 17:38:21 -06:00
Roger Ferrel
bb99fc1786 Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0

Former-commit-id: d6d99f5e30 [formerly ee038e811c] [formerly a46535ee0c] [formerly d6d99f5e30 [formerly ee038e811c] [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a46535ee0c [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]]]
Former-commit-id: 65d10be5d6
Former-commit-id: b42d50faed [formerly 42f453ffca] [formerly 2a9ce01552cb82c75c8d83ada1b390cf88194546 [formerly 35f3a3953c]]
Former-commit-id: b4cc1e5dfe5e0670423a5cce3ddd39aedbd7aa98 [formerly f2f0d2320f]
Former-commit-id: dda46f3046
2012-11-07 15:07:47 -06:00
Roger Ferrel
01e25a5e86 Issue #1298 Changes for non-blocking CallToActionsDlg.
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc

Former-commit-id: dd9e28d58a [formerly 4b0c701d69] [formerly 190922a233] [formerly dd9e28d58a [formerly 4b0c701d69] [formerly 190922a233] [formerly 81de6cd45b [formerly 190922a233 [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]]]
Former-commit-id: 81de6cd45b
Former-commit-id: 1358368fb1 [formerly d6e00b6c35] [formerly a7fc02e7168c2f8831b77da9c66722dbbf5aaca1 [formerly d6560d7730]]
Former-commit-id: 9465c83ddbf5a04d735808331efa69a3f68cc858 [formerly 1d7ee19deb]
Former-commit-id: 51b57e0dfa
2012-11-07 14:35:38 -06:00