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

2442 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roger Ferrel
9e3fb2168f Issue #1790 Minor changes to bring code up to Raytheon standards. 
Change-Id: Iad49a91187bc8f6f4eab9be23fa030399bffd12b

Former-commit-id: d0bf884341 [formerly dd9012a533] [formerly 1f50588858 [formerly 89095dce81484d1629f399d849581585a8c67431]]
Former-commit-id: 1f50588858
Former-commit-id: adcd68a70d
 2013-04-23 12:20:53 -05:00
Roger Ferrel
0018cad990 Issue #1790 Changes for non-blocking dialogs DescriptionDlg, FloodCategoryDlg, FloodDamageDlg, GageHistoryDlg, HydroGenConfigDlg, LowWaterDlg, NwrTransmitterDlg, PreferencesDlg, PublicationsDlg and QcAlertAlarmLimitsDlg. 
Change-Id: Ic4a3ccb3e13344244415786591accbffda0d0e96

Former-commit-id: 1af1e9e61a [formerly 75c1470c3a] [formerly 2dafedfed2 [formerly b9d5321cdeaeb9b37783e96b76321ddb90c0d6dd]]
Former-commit-id: 2dafedfed2
Former-commit-id: 399a54cc4b
 2013-04-23 11:42:14 -05:00
Dustin Johnson
ef0c554826 Issue #1910 Changes to comply with the Ebxml 4.0 spec for SubmitObjects 
Amend: Rebase on newest development commits

Change-Id: I70fcf39d4c819e961921496c9a8f9097981b1de7

Former-commit-id: 42b2e12061 [formerly 457710f5d4] [formerly 3adc0f3bd9 [formerly 78bfd27bf513a4014c957a069432e8a05d519004]]
Former-commit-id: 3adc0f3bd9
Former-commit-id: 6b1bd85a9b
 2013-04-22 11:25:08 -05:00
Nate Jensen
5718dcb41a Merge "Issue #1638 Made string rendering always look right despite extent proportions so it is never warped. Moved dataURI map creation to DataURIUtil. Fixed double dispose of controls in VizDisplayPane, also made resize non interface method." into development 
Former-commit-id: 838764f6fc [formerly 7291751e25] [formerly 10a6569e15 [formerly 83643b2b8027b625be5e8f84e0f11ac22216dd64]]
Former-commit-id: 10a6569e15
Former-commit-id: 0d5b751c87
 2013-04-22 10:00:09 -05:00
Lee Venable
25bda37e80 Merge "Issue #1790 Changes for non-blocking dialogs CountyStateDlg, CountyZoneUgcDlg, DataAdjustFactorDlg, DataIngestFilterDlg, DataPurgeParamsDlg and DatumDlg; also changes to hydro data mangagers to remove ArrayList for method interfaces." into development 
Former-commit-id: 77ce4f1ee6 [formerly bbd95b4da1] [formerly 64a7e6f289 [formerly b3f3ac6dbffbc3522dfa2fa2e9de52959b630a41]]
Former-commit-id: 64a7e6f289
Former-commit-id: 2082d56998
 2013-04-22 09:22:14 -05:00
Dustin Johnson
77f8d21aad Issue #1910 Ignore abstract test 
Change-Id: I6406dd7e0a1cc663a5e961e475e73d2dcc60e335

Former-commit-id: a625160464 [formerly 9cf9068d0e] [formerly bf02570479 [formerly 5e8d880759699381fa4b1316fb1f8a1d4da98b11]]
Former-commit-id: bf02570479
Former-commit-id: 7df6e3dc90
 2013-04-22 08:48:51 -05:00
Max Schenkelberg
69abb31ee6 Issue #1638 Made string rendering always look right despite extent proportions so it is never warped. Moved dataURI map creation to DataURIUtil. Fixed double dispose of controls in VizDisplayPane, also made resize non interface method. 
Amend: Fixed menu mix up and making sure perspective bar is on by default

Change-Id: I0c19e5fbf0f0d29cdca0f63afb33ca964a145b94

Former-commit-id: c8fcaf06d1 [formerly b91b706701] [formerly 1d3c378dde [formerly 53e42aa3925399271cc3ad4ee964476ddffc8eb6]]
Former-commit-id: 1d3c378dde
Former-commit-id: e05c12e246
 2013-04-19 14:57:40 -05:00
Roger Ferrel
5406b16e40 Issue #1790 Changes for non-blocking dialogs CountyStateDlg, CountyZoneUgcDlg, DataAdjustFactorDlg, DataIngestFilterDlg, DataPurgeParamsDlg and DatumDlg; also changes to hydro data mangagers to remove ArrayList for method interfaces. 
Change-Id: Id5f56669045afd402bed893c13977641ef59835b

Former-commit-id: 2bcc5e655c [formerly c761fd0938] [formerly ec275df412 [formerly 23bf9839c60aa33d7bf43492b72acbeedcf518b9]]
Former-commit-id: ec275df412
Former-commit-id: ceb9d10fdc
 2013-04-19 13:42:46 -05:00
Bryan Kowal
9423b26507 Issue #1927 - fixed CAVE rpm dependency determination 
Former-commit-id: f78a58c6be [formerly 79e22d6770] [formerly 988fbfc8ad [formerly cc1a0ed662343a382f992bd43ba3b78c11cfd78b]]
Former-commit-id: 988fbfc8ad
Former-commit-id: c30292262a
 2013-04-19 08:36:10 -05:00
Lee Venable
dfc4f50b3a Merge "Issue #1790 Changes for non-blocking CountyStateDlg." into development 
Former-commit-id: f12dec046b [formerly cf1347c380] [formerly 95b3e0dd4b [formerly 839e6d466d59e78d906380d742ea1999ff1115c0]]
Former-commit-id: 95b3e0dd4b
Former-commit-id: 8444e9ff54
 2013-04-18 14:42:48 -05:00
Dustin Johnson
ef7be9524e Merge "Issue #1914 Add email notification as a notification listener" into development 
Former-commit-id: 1d906fecca [formerly b593a2581c] [formerly 4f60e45094 [formerly 1c6174bde3598fbe3b22aefb1c36a3a49968466b]]
Former-commit-id: 4f60e45094
Former-commit-id: 2c28b53ea4
 2013-04-18 13:25:57 -05:00
Dustin Johnson
6ded48bcd8 Issue #1914 Add email notification as a notification listener 
Amend: Fix broken test

Change-Id: I3b692255b5d84fffce174c0447970fe627f4a61e

Former-commit-id: f3d53eb889 [formerly 74a9b93d05] [formerly 067b20c684 [formerly 45b5a9cffd6c57dc8ea1355ee623fcf6014dd377]]
Former-commit-id: 067b20c684
Former-commit-id: 7b09a0e477
 2013-04-18 12:57:38 -05:00
Nate Jensen
880776f544 Merge "Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project" into development 
Former-commit-id: 27efccb414 [formerly 8f04f5329c] [formerly b8719b47c6 [formerly 2a198f5f3c8476888f2ea12679c1eb54f0b41c84]]
Former-commit-id: b8719b47c6
Former-commit-id: ad10365a43
 2013-04-18 12:31:39 -05:00
Dustin Johnson
912cc39887 Merge "Issue #1914 Add plugin based registry notification" into development 
Former-commit-id: af04ecf92b [formerly 1edba0cdc6] [formerly 67eb771ccb [formerly 0b7539d488388f4f96af0ccf97f5651c8e7d8259]]
Former-commit-id: 67eb771ccb
Former-commit-id: 375221e524
 2013-04-18 11:00:57 -05:00
Benjamin Phillippe
f38475de7d Issue #1905 Implemented registry notifications via email 
Change-Id: I2753074c302d707066ac0de42ac5b0778049275d

Former-commit-id: a44a4b69ff [formerly a525a1430c] [formerly 7e6b8eedca [formerly e8dba1178491176da3543a46c0d543c489b5fcb1]]
Former-commit-id: 7e6b8eedca
Former-commit-id: 9742cc996f
 2013-04-18 10:19:12 -05:00
Roger Ferrel
09a615a7c1 Issue #1790 Changes for non-blocking CountyStateDlg. 
Change-Id: I101202dbe8f5c1fdd9bac9b86a629960d9681e7d

Former-commit-id: 44bb7ab00d [formerly 910adae4ee] [formerly 9c428385ee [formerly a1b5f0b08a08bed1b76f81094970594aeae0a1f3]]
Former-commit-id: 9c428385ee
Former-commit-id: 04cd4f7f37
 2013-04-18 07:49:08 -05:00
Dustin Johnson
1ea04e20e0 Issue #1914 Add plugin based registry notification 
Change-Id: Ie450b60683e4c317ac19628cb923310b828747a7

Former-commit-id: dd190be390 [formerly 91fe9ea501] [formerly 8989c09566 [formerly c75a5f6664b3c6d79773f4eda52ce03dfb5ba877]]
Former-commit-id: 8989c09566
Former-commit-id: 0e1994a03c
 2013-04-17 12:17:23 -05:00
Max Schenkelberg
1950aff01a Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project 
Amend: Removed eclipse feature all together, added os and arch to fragments.  Ensured unpack flag stayed same when changing features.

Change-Id: I78a2c5262ebdbe3ace3c180254b5f036011c0a65

Former-commit-id: 6ccef4d3c7 [formerly bd52681be3] [formerly 7513e5982b [formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]
Former-commit-id: 7513e5982b
Former-commit-id: 57f34e9080
 2013-04-17 11:42:46 -05:00
Roger Ferrel
985d27c132 Issue #1790 Changes for non-blocking ArealDefinitionsDlg, CoopAgencyOfficeDlg, CopyNewLocationDlg and BenchmarkDlg. 
Change-Id: Ie4b0cbe02f0ba74ec6678acb20c9d085b08a4cea

Former-commit-id: be06f98b17 [formerly 3f79090c6b] [formerly 5d23b6a450 [formerly f3eb94989b149efb8651f37d2171615829eabf9d]]
Former-commit-id: 5d23b6a450
Former-commit-id: 96e603043a
 2013-04-17 10:43:32 -05:00
Roger Ferrel
66ffbeb3a6 Issue #1790 Changes for non-blocking AdministrationDlg. 
Change-Id: Iec8d71c747ef5167cd49909caba33176519cd07d

Former-commit-id: f24bd5d02b [formerly e8093a3a56] [formerly 0194324742 [formerly aa671a4bcfbd26ade407a8e52c6fe5eac69eb83f]]
Former-commit-id: 0194324742
Former-commit-id: f3da79e406
 2013-04-16 16:34:00 -05:00
Roger Ferrel
9c8faa3b5b Issue #1790 Changes for non-blocking AddModifyLocationDlg. 
Change-Id: Ice2d3a8bbeaff0689d2b4e0a2ba8bbee017fb080

Former-commit-id: 2d6c308083 [formerly 3c42ad8145] [formerly f410ee5f89 [formerly 8e78b6799404059032f10b97e62d385e07852c53]]
Former-commit-id: f410ee5f89
Former-commit-id: f576747b38
 2013-04-16 15:54:02 -05:00
Roger Ferrel
6d6eb9b7c3 Issue #1790 Changes for non-blocking ForecastAttributeDlg. 
Change-Id: I3724d165f721f9664f69ede09864a9714e35405b

Former-commit-id: ad47a959f4 [formerly 2b2dabdc71] [formerly c1b7b2e3bd [formerly f4d3fdda15d34a454887c9a14b6deada7a698141]]
Former-commit-id: c1b7b2e3bd
Former-commit-id: 1f0b994b9a
 2013-04-16 14:44:03 -05:00
Roger Ferrel
b49ab42ce1 Issue #1790 Changes for non-blocking StationReportingStatusDlg. 
Change-Id: Icd11c338c2bc7399c10205d10d3c11ff034d61d7

Former-commit-id: aa11977fd3 [formerly 1ba7a11037] [formerly af0aa091f3 [formerly ec789fc71009b77d6f44b7eba606ba5259d253a8]]
Former-commit-id: af0aa091f3
Former-commit-id: 2020d82599
 2013-04-16 12:51:18 -05:00
Dustin Johnson
ce9f5a7365 Issue #1910 Add some tests of the LifecycleManager SubmitObjects functionality 
Change-Id: Ieb1544cb52cf108836b157e3d800c470fa5cf3e1

Former-commit-id: 67e49201d6 [formerly 255aea053b] [formerly 58b6899672 [formerly c4344f5402fe33e7e47515adc3b54913f9c13617]]
Former-commit-id: 58b6899672
Former-commit-id: cb899b3fa0
 2013-04-16 11:30:06 -05:00
Dustin Johnson
ee0572026a Issue #1906 Remove new registry plugin from datadelivery feature 
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598

Former-commit-id: e44d3a8715 [formerly c8241840c5] [formerly 977702e876 [formerly 71b4bb07870f5490d89a1fe657429444c54a2689]]
Former-commit-id: 977702e876
Former-commit-id: 8170693941
 2013-04-16 10:36:56 -05:00
Dustin Johnson
395e4db621 Issue #1906 Remove use of hibernate columnDefinition from SubscriptionType 
Change-Id: I310914180865ca65290c48dc1c55f9dc11f3c044

Former-commit-id: 3e5ace2cf3 [formerly 391a7bb999] [formerly 8b38dec4bb [formerly 67ff37feac0998378a30c09894fab7ea0dbd84f8]]
Former-commit-id: 8b38dec4bb
Former-commit-id: 80ff75c473
 2013-04-16 08:08:47 -05:00
Nate Jensen
d785d3f1c2 Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development 
Former-commit-id: 56c1fe7422 [formerly 0cbf561f7c] [formerly d411aad285 [formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]
Former-commit-id: d411aad285
Former-commit-id: 9d0e3fd0c2
 2013-04-15 14:57:03 -05:00
Matt Nash
317cbf0950 Issue #1870 add package-info.java so that the empty src directory gets pushed to git 
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840

Former-commit-id: 7ffb45758d [formerly 0d12fb16bc] [formerly 4b896002ac [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]
Former-commit-id: 4b896002ac
Former-commit-id: 87af6d2809
 2013-04-15 14:53:07 -05:00
Lee Venable
42aefd0d77 Merge "Issue #1904 - FFMPConfig no longer able to be reset." into development 
Former-commit-id: 966085d878 [formerly c5c885b28b] [formerly 770f473bf7 [formerly 72178a388b7114f92146ba7fbb1eb062cbeb7aa4]]
Former-commit-id: 770f473bf7
Former-commit-id: 668a5133f6
 2013-04-15 13:11:34 -05:00
Mike Duff
b847733566 Issue #1904 - FFMPConfig no longer able to be reset. 
Change-Id: I9e7a7628ca1cd77964574fbc84c2cd2f78364872

Former-commit-id: 2323505f91 [formerly 18e5561dd2] [formerly f9c0de442f [formerly 5775e40e5f939ca847527ae562cba71dc3984a60]]
Former-commit-id: f9c0de442f
Former-commit-id: c0f6fe5199
 2013-04-15 13:02:58 -05:00
Dustin Johnson
7268795739 Merge "Issue #1802 Implemented ebxml registry replication" into development 
Former-commit-id: 20ee731e62 [formerly 4276b4efa1] [formerly 52095664e0 [formerly 51fea5de5df2ff5ad2169614fb6f4d64ea586c6b]]
Former-commit-id: 52095664e0
Former-commit-id: fdf0f29feb
 2013-04-15 12:42:23 -05:00
Bryan Kowal
8e27924557 Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades. 
Former-commit-id: 0800c14061 [formerly cca3f43736] [formerly c797715efe [formerly d0fe712b37f7890c547470b24139635183ee9e1e]]
Former-commit-id: c797715efe
Former-commit-id: 671e600a62
 2013-04-15 09:40:43 -05:00
Benjamin Phillippe
e5fbf006dd Issue #1802 Implemented ebxml registry replication 
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531

Former-commit-id: e3f3483b51 [formerly 120906de78] [formerly ec69cdeb44 [formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]
Former-commit-id: ec69cdeb44
Former-commit-id: c0099a8a39
 2013-04-12 11:27:45 -05:00
Nate Jensen
0c1f005323 Merge "Issue #1871 convert parameters to Strings and make sure to return them" into development 
Former-commit-id: 00f75a3063 [formerly e8218d0e3c] [formerly fe163c5c16 [formerly e9df9576305b7d58b92de6917675f8c38c020270]]
Former-commit-id: fe163c5c16
Former-commit-id: e6a24551af
 2013-04-12 09:31:52 -05:00
Matt Nash
4ee6085bda Issue #1871 convert parameters to Strings and make sure to return them 
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

Former-commit-id: 64323fc0af [formerly cd77308fac] [formerly 6c488cee05 [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]
Former-commit-id: 6c488cee05
Former-commit-id: 7dd72ab7d5
 2013-04-12 09:31:23 -05:00
Matt Nash
e6fc7942b8 Issue #1871 add default values for times so they don't need to be sent in from 
Python, move getLatLonCoords()

Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1

Former-commit-id: 2ab1cf8abb [formerly 3af61d7117] [formerly b44ee44664 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]
Former-commit-id: b44ee44664
Former-commit-id: c95e825d35
 2013-04-12 09:31:16 -05:00
Matt Nash
705be14b64 Issue #1871 make Java data access class better match Python version 
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051

Former-commit-id: baafdafed7 [formerly 68c84fd8cc] [formerly 4ac6480f52 [formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]
Former-commit-id: 4ac6480f52
Former-commit-id: 7ffd8efcf2
 2013-04-12 09:31:07 -05:00
Nate Jensen
12d4837e78 Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development 
Former-commit-id: 03fac8cb06 [formerly 36ad161721] [formerly 8561b201d5 [formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]
Former-commit-id: 8561b201d5
Former-commit-id: 826e64a990
 2013-04-12 09:30:38 -05:00
Matt Nash
123351e82b Issue #1870 implement PathManager interface in Python to allow Python code to 
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 68892951c5 [formerly bf01f50e17] [formerly 4b23ec7c0a [formerly e3df8efa51ad95c952318b59edca702157a59856]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: caf1f1fdf7
 2013-04-12 07:55:56 -05:00
Dustin Johnson
9b1a6c153c Merge "Issue #1891 Fix sorting in pending subscription table" into development 
Former-commit-id: 1aec1ca6cd [formerly 355e654c1e] [formerly d117a40e7c [formerly f1360b8ef80c343ad16b2345c500ea48c17ba209]]
Former-commit-id: d117a40e7c
Former-commit-id: d149e51484
 2013-04-10 14:50:14 -05:00
Dustin Johnson
a4519615ab Issue #1891 Fix sorting in pending subscription table 
Amend:  Rename getRowData() to getDisplayData()

Change-Id: Icc433f289d87273524468d0cf4e1bc799df134aa

Former-commit-id: 8b6a9551a1 [formerly d9544f3b73] [formerly 36cdd94a65 [formerly b37624ebadc626e3dc30f669881d0b7bb87a7c45]]
Former-commit-id: 36cdd94a65
Former-commit-id: f7505eefc2
 2013-04-10 14:04:55 -05:00
Max Schenkelberg
e369546b51 Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions 
Amend: Create copy on write for PluginFactory

Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f

Former-commit-id: 1bec335fd7 [formerly 6e70b21f5f] [formerly b695de3698 [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]
Former-commit-id: b695de3698
Former-commit-id: f2a0f8223a
 2013-04-10 10:04:17 -05:00
Dustin Johnson
8c5d379b72 Issue #1841 Update delta script for renaming PendingSubscription to PendingUserSubscription. 
Change-Id: Ie1e485a5b8f5bce3032806fe3b0f4e78d46f93e6

Former-commit-id: 7616bb80aa [formerly bba3563265] [formerly ce96090763 [formerly d2a1704aa98f03086f7a07e416aa6aaea1d36121]]
Former-commit-id: ce96090763
Former-commit-id: 08a08803fe
 2013-04-09 11:43:53 -05:00
Dustin Johnson
0578916ec1 Issue #1826 Remove delivery/notify options for subscriptions 
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: f3526508f3 [formerly 11fd2d676b] [formerly 6bc69df127 [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]
Former-commit-id: 6bc69df127
Former-commit-id: b78f56f1ca
 2013-04-09 11:40:25 -05:00
Dustin Johnson
4b4eb8e406 Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions. 
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.

Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf

Former-commit-id: cef805e79a [formerly 61346b1388] [formerly f3bdede2c8 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]
Former-commit-id: f3bdede2c8
Former-commit-id: 8c52cd190f
 2013-04-05 12:41:02 -05:00
Bryan Kowal
607d5b205d Issue #1805 - restore the full nightly delta build. 
Former-commit-id: 1ebf50c7ed [formerly 52be309cac] [formerly dc522ede44 [formerly 9dc700dbf0d7ff8347fda64bdd60879c267dd2f4]]
Former-commit-id: dc522ede44
Former-commit-id: 04e22df174
 2013-04-04 16:16:53 -05:00
Greg Armendariz
f452a4582a Merge "Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE" into development 
Former-commit-id: 6e0ced27dc [formerly d6d0e0131f] [formerly 71d400e09f [formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]
Former-commit-id: 71d400e09f
Former-commit-id: d463555ca3
 2013-04-04 13:00:39 -05:00
Bryan Kowal
6a66158097 Issue #1864 - datadelivery and kml are now dependent on the core viz feature. 
Former-commit-id: 70c8ed6bc0 [formerly 3fac666de5] [formerly 64c54f2110 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]
Former-commit-id: 64c54f2110
Former-commit-id: 49ee55327d
 2013-04-04 12:48:59 -05:00
Steve Harris
a400879732 Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 8b5b1d286b [formerly 56410d2a04] [formerly 731ed52cd6 [formerly 6e7c89a07a4105097de3ffa1b7522fdae93baa5b]]
Former-commit-id: 731ed52cd6
Former-commit-id: a419f72b2d
 2013-04-04 12:01:23 -05:00
Steve Harris
0f53c46d7a Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: ed8c0487fe
 2013-04-04 11:58:50 -05:00