Dustin Johnson
9932db9b09
Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
...
Former-commit-id: 9a6b647989
[formerly c6137e89e7
] [formerly ef632b7bfa
[formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]
Former-commit-id: ef632b7bfa
Former-commit-id: b3f7f77bf6
2013-03-05 08:53:09 -06:00
Bryan Kowal
0d9400b2ec
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Former-commit-id: d484acbca0
[formerly 3a8efd5edf
] [formerly 8b4dce1c3d
[formerly d466b647d0d810418a88c875f39e55d98d680aa1]]
Former-commit-id: 8b4dce1c3d
Former-commit-id: eba8ccc6cd
2013-03-04 17:58:04 -06:00
Richard Peter
a4bf42628a
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: e74f6074e7
[formerly 070f62d08e
] [formerly 784cd2145f
[formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 784cd2145f
Former-commit-id: 180540eb47
2013-03-04 17:48:05 -06:00
Dave Hladky
0f3c9ba997
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: 22ebfe0ecb
[formerly 680317d9c4
] [formerly fc36146f48
[formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: fc36146f48
Former-commit-id: 1260b40307
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
c99a17709e
Issue #1628 move xmx settings to linux so windows can override.
...
Former-commit-id: 5a88604ed6
[formerly fad56e32cc
] [formerly c1c5ac7926
[formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]
Former-commit-id: c1c5ac7926
Former-commit-id: b16399cfdb
2013-03-04 16:47:11 -06:00
Bryan Kowal
8512836953
Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
...
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a
Former-commit-id: eb4d75de7f
[formerly 862f97a19b
] [formerly cd08f88c43
[formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]
Former-commit-id: cd08f88c43
Former-commit-id: d9c1a92b8e
2013-03-04 15:52:07 -06:00
Dustin Johnson
67d6a4ac99
Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
...
Amend:
Use isEmpty() where possible in BandwidthManager.
Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec
Former-commit-id: 73f884753a
[formerly 1161125c84
] [formerly 54c3980cba
[formerly 28c97849800c624bdaa161f05777703ee2a510ac]]
Former-commit-id: 54c3980cba
Former-commit-id: c0a1ae396a
2013-03-04 14:55:50 -06:00
Steve Harris
f70ff93d2c
Issue #1744 - Revert "Issue #1744 fix deadlock"
...
This reverts commit c5600acf79
[formerly f7ffa22c7c
] [formerly f4cccabc07
] [formerly e2f12d16b7
[formerly 2a575a24e7
] [formerly f4cccabc07
[formerly 48ef00523488cdf4f65b86c5b74331f908192191]]].
Former-commit-id: 7ffb42d6e6
[formerly 28391884a7
] [formerly fcb48a7280
[formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]
Former-commit-id: fcb48a7280
Former-commit-id: 9e87721b85
2013-03-04 13:03:19 -06:00
Steve Harris
ee2452f5d3
Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
...
This reverts commit 348f5f0f41
[formerly 33da766f63
] [formerly 35007e0460
] [formerly 3dc69632c1
[formerly 8c84bc5fbb
] [formerly 35007e0460
[formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]].
Former-commit-id: 870972fb90
[formerly 88e633934d
] [formerly bba410a330
[formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]
Former-commit-id: bba410a330
Former-commit-id: 7d2286aea7
2013-03-04 13:02:32 -06:00
Nate Jensen
e15d933ffb
Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
...
Former-commit-id: 5d772a2228
[formerly 0542f04538
] [formerly 773b39548d
[formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]
Former-commit-id: 773b39548d
Former-commit-id: aaac07f26c
2013-03-04 12:28:19 -06:00
Dustin Johnson
bbba19a26f
Issue #1647 Configure NCF and WFO retrieval tasks
...
Change-Id: I038a8c297587982b98ca419311b4e38894947ed4
Former-commit-id: 527ed01fec
[formerly de7f387248
] [formerly bf9eefe961
[formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]]
Former-commit-id: bf9eefe961
Former-commit-id: 81fcd0bc65
2013-03-04 10:22:16 -06:00
Matt Nash
739a4ac2db
Issue #1476 make fix for collaboration for issues with closing of views when detached
...
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293
Former-commit-id: 311ac710ca
[formerly fdc6db0a50
] [formerly 1d25736871
[formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]
Former-commit-id: 1d25736871
Former-commit-id: 274becd212
2013-03-04 09:41:11 -06:00
Ron Anderson
fd86a481a7
Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
...
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8
Former-commit-id: f1d5ff7c9e
[formerly fdeb45705b
] [formerly e8f1b460ce
[formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]
Former-commit-id: e8f1b460ce
Former-commit-id: 78a8d8f1a1
2013-03-04 09:30:04 -06:00
Dustin Johnson
b6936472c8
Issue #1644 Remove SWT jars from Eclipse tests project classpath
...
Change-Id: I50e48c5119fc05f49db8ed8cdb477f373b9c1242
Former-commit-id: af245e134e
[formerly 3436c86641
] [formerly 357b968ae1
[formerly 492688be79bd2ddbffee25e0baa256c23cc766eb]]
Former-commit-id: 357b968ae1
Former-commit-id: dcd451229e
2013-03-04 09:28:53 -06:00
Richard Peter
e00d5344b1
Issue #1740 : Baseline cave monitoring script
...
Former-commit-id: 1632bd2882
[formerly 163fb343de
] [formerly 783e9c1a25
[formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]
Former-commit-id: 783e9c1a25
Former-commit-id: 94d804a301
2013-03-01 16:17:25 -06:00
Bryan Kowal
c672931e5b
Issue #1638 - remove apache camel from the ncep feature. no plugin in the feature currently even imports
...
a package from apache camel
Change-Id: I88a91b8802d93e88b2fe66801ee336c3eb4bfd5a
Former-commit-id: ec2ca3f1f1
[formerly 62e7cca531
] [formerly bd7877a71e
[formerly e1bef5abe061a7dd550dc8e38318b275e6653470]]
Former-commit-id: bd7877a71e
Former-commit-id: 8fd24a3969
2013-03-01 14:32:31 -06:00
Nate Jensen
75366a9e5a
Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
...
Former-commit-id: 6bf2eefa2a
[formerly a90a2fe857
] [formerly 677908868e
[formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]
Former-commit-id: 677908868e
Former-commit-id: 216e3d6ad3
2013-03-01 13:43:50 -06:00
Bryan Kowal
5958c0a876
Issue #1739 - fix Wes2Bridge
...
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814
Former-commit-id: 9022c53d53
[formerly 20d3c6bcaa
] [formerly 86a1f16e37
[formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]
Former-commit-id: 86a1f16e37
Former-commit-id: ed6e1003ff
2013-03-01 11:49:09 -06:00
David Gillingham
622700dee9
Issue #1447 : Initial commit of VTEC table sharing functionality: port A1 changes to
...
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.
Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510
Former-commit-id: ca81ae4a71
[formerly 50744c1f92
] [formerly 9351f33c1c
[formerly 1e72fe30d97504f70352a181de35805a197e50f4]]
Former-commit-id: 9351f33c1c
Former-commit-id: 77a3f33fd5
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
8f4c2f2a39
Issue #1731 Optimize construction of scan resource.
...
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: b0870c55f6
[formerly 86b9a4d8c2
] [formerly 9263ff1846
[formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]
Former-commit-id: 9263ff1846
Former-commit-id: 5a149c5dfa
2013-03-01 11:03:11 -06:00
Richard Peter
db5e8ed2dd
Merge "Issue #1744 actually fix deadlock this time" into omaha_13.3.1
...
Former-commit-id: f2ae906f93
[formerly 1754861897
] [formerly c50e1cbe1c
[formerly 7eafcb1e677fafadc039a5106f296dbee1245136]]
Former-commit-id: c50e1cbe1c
Former-commit-id: 6fd7af5362
2013-03-01 10:50:33 -06:00
Nate Jensen
348f5f0f41
Issue #1744 actually fix deadlock this time
...
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb
Former-commit-id: 3dc69632c1
[formerly 8c84bc5fbb
] [formerly 35007e0460
[formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]
Former-commit-id: 35007e0460
Former-commit-id: 33da766f63
2013-03-01 10:48:03 -06:00
Richard Peter
73ea950d5f
Merge "Issue #1744 fix deadlock" into omaha_13.3.1
...
Former-commit-id: ee1b0df106
[formerly 79c70dacbd
] [formerly 7dcc007bee
[formerly 6fbc789e08a5e6baf7ae6ff1348e1e2c5709c422]]
Former-commit-id: 7dcc007bee
Former-commit-id: 3a8a2f5815
2013-03-01 10:27:36 -06:00
Bryan Kowal
0be2bc1f80
Issue #1739 - remove reference to non-existent junit version
...
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78
Former-commit-id: 29e157d94e
[formerly 5138fe5537
] [formerly 44215e65e9
[formerly f4249d163f057560504b5cbc3745b7ae4b36f28c]]
Former-commit-id: 44215e65e9
Former-commit-id: a2e3556f7e
2013-03-01 10:26:25 -06:00
Nate Jensen
a7cc38e3ba
Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
...
Former-commit-id: 308de6885f
[formerly d695473b0f
] [formerly 302e851b67
[formerly 94e54241b7e85c523e019603cd9e815c179dc584]]
Former-commit-id: 302e851b67
Former-commit-id: 0d0dfb474f
2013-03-01 10:15:46 -06:00
Nate Jensen
c5600acf79
Issue #1744 fix deadlock
...
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f
Former-commit-id: e2f12d16b7
[formerly 2a575a24e7
] [formerly f4cccabc07
[formerly 48ef00523488cdf4f65b86c5b74331f908192191]]
Former-commit-id: f4cccabc07
Former-commit-id: f7ffa22c7c
2013-03-01 10:12:56 -06:00
Bryan Kowal
c4709b1bfb
Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
...
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue
Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc
Former-commit-id: f806c880d3
[formerly d081a2afcd
] [formerly 4faf8aefbe
[formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: 4faf8aefbe
Former-commit-id: 497bf33892
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
334af0001b
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: d27d30c2db
[formerly f46686a6e2
] [formerly 2ca86633d6
[formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]
Former-commit-id: 2ca86633d6
Former-commit-id: 5068b18c6a
2013-02-28 17:00:56 -06:00
Dustin Johnson
ad9d95ef08
Merge "Issue #1673 : Moved data delivery specific files from minDB configuration where possible" into development
...
Former-commit-id: 64cfd1c51d
[formerly 44140d1e0f
] [formerly 59212a8241
[formerly fa998e70583a79d591eb956f9ab5deabc4eadea3]]
Former-commit-id: 59212a8241
Former-commit-id: c7d5feb7d6
2013-02-28 16:24:21 -06:00
Benjamin Phillippe
1314c47acf
Issue #1738 : Removed unused project com.raytheon.uf.edex.ebxml
...
Change-Id: I87783b45692c84cf851fb5695dae7efa79308655
Former-commit-id: fd5302a619
[formerly e0033900cf
] [formerly e01ae283f7
[formerly 323bdc5919de9f04849e325dfdeb868ccdb39603]]
Former-commit-id: e01ae283f7
Former-commit-id: 3940bf0a6d
2013-02-28 15:01:53 -06:00
Benjamin Phillippe
aaacef1396
Issue #1673 : Moved data delivery specific files from minDB configuration where possible
...
Change-Id: I09b34e7c429b4f657e586fc64bcbbcc1ceed3585
Former-commit-id: b2da92ac85
[formerly 29e2b0fd9e
] [formerly d3d5886233
[formerly b279ad4cc4401c54cd0e2af8170e254cbbc0e53b]]
Former-commit-id: d3d5886233
Former-commit-id: 3802541578
2013-02-28 14:56:31 -06:00
Bryan Kowal
da0d99d22f
Issue #1638 - update CAVE rpm name generation
...
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f
Former-commit-id: a9123a2b84
[formerly b8496877ff
] [formerly 5eb888fb98
[formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]
Former-commit-id: 5eb888fb98
Former-commit-id: 22acca8f3d
2013-02-28 14:43:53 -06:00
Ben Steffensmeier
f49b8cec68
Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
...
Former-commit-id: 74296b32db
[formerly df38a21e11
] [formerly aaffde9bf5
[formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]
Former-commit-id: aaffde9bf5
Former-commit-id: 453723dc9d
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
4bdd2946ee
Issue #1731 Remove unneccessary query in getDataStore.
...
Former-commit-id: 61875750c1
[formerly 52a64eda01
] [formerly 38728f3073
[formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]
Former-commit-id: 38728f3073
Former-commit-id: 586438b393
2013-02-28 13:59:02 -06:00
Bryan Kowal
ecda5fe131
Issue #1638 - fix the build; temporarily copy features that are not built until the build
...
is capable of resolving its own dependencies.
Change-Id: Id6f31f6428178bf2174079e53f32ca522eeaa445
Former-commit-id: c099bc0df8
[formerly 30f59c4bcc
] [formerly 4f30dbb2b8
[formerly e2c597978c6559a4ef1d5eebb00328584745dae1]]
Former-commit-id: 4f30dbb2b8
Former-commit-id: 6a298318c5
2013-02-28 10:02:40 -06:00
Max Schenkelberg
fc58e7431a
Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
...
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62
Former-commit-id: 1769edc026
[formerly ec40d261e5
] [formerly 547c593dec
[formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]
Former-commit-id: 547c593dec
Former-commit-id: 13a4056335
2013-02-27 16:19:58 -06:00
Richard Peter
7adde5c3aa
Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
...
Former-commit-id: 2950dc9c42
[formerly 1ce1fb213b
] [formerly a9ffc8b170
[formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]
Former-commit-id: a9ffc8b170
Former-commit-id: c0e0a44e5f
2013-02-27 16:16:09 -06:00
Richard Peter
b3c0f56954
Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
...
Former-commit-id: 7c1c44c22f
[formerly 6535c1b6c7
] [formerly 656d9d74ae
[formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]
Former-commit-id: 656d9d74ae
Former-commit-id: ba4a86de16
2013-02-27 14:46:49 -06:00
Ron Anderson
b2bffcf0de
Issue #1597 Moved some interpolation messages to Performance Log for consistency.
...
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8
Former-commit-id: f491d7f7c3
[formerly c9ca7a2943
] [formerly 079cdbcb29
[formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]
Former-commit-id: 079cdbcb29
Former-commit-id: a5195e137e
2013-02-27 14:45:30 -06:00
Bryan Kowal
65fb00c3c3
Issue #1662 - wrapper parameters can now be used to specify the order
...
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters
Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c
Former-commit-id: 5b3478d6c7
[formerly 8bf5e3ffad
] [formerly 44349717fb
[formerly aae64b29491d8da0001cf1182a357683546d4593]]
Former-commit-id: 44349717fb
Former-commit-id: 4f7fed259c
2013-02-27 12:46:48 -06:00
Ben Steffensmeier
0b2373ab4d
Issue #1659 Add time agnostic caching to grid derived parameters
...
Change-Id: I59db267004a7acd51642c4360404e96d50378480
Former-commit-id: ebfedad360
[formerly db1028ee7a
] [formerly 6d85856e60
[formerly 9685d0b363f21afbb42df02e9871884123d75e2c]]
Former-commit-id: 6d85856e60
Former-commit-id: 8112f669b3
2013-02-27 12:37:14 -06:00
Ron Anderson
e240568bb9
Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
...
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27
Former-commit-id: 50f5e44b39
[formerly 36be1c5850
] [formerly c35e06d82c
[formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]
Former-commit-id: c35e06d82c
Former-commit-id: 5bd0dbcfca
2013-02-27 12:34:40 -06:00
Max Schenkelberg
41706c42f2
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: c8a5f1a007
[formerly 0f1112fb3e
] [formerly 38bba3705f
[formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]
Former-commit-id: 38bba3705f
Former-commit-id: 6ebc058df4
2013-02-27 12:26:32 -06:00
Max Schenkelberg
5617dfaa67
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: 2611980ca4
[formerly 4ed4ef8d71
] [formerly e0ba97d547
[formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]
Former-commit-id: e0ba97d547
Former-commit-id: 6b1426dd34
2013-02-27 11:50:38 -06:00
Richard Peter
0f1c3dd256
Merge "Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm" into development
...
Former-commit-id: b354ebb862
[formerly 6c766ddd85
] [formerly 84e1b2f999
[formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]
Former-commit-id: 84e1b2f999
Former-commit-id: 9fa37933e6
2013-02-27 11:43:18 -06:00
Jonathan Sanchez
45f84bc698
Issue #1556 Added and exported jep from tests project
...
Change-Id: Ied6c3e85ead2152364ed50e69493aa454a1c5092
Former-commit-id: fcc59d2334
[formerly 0d7bcdc42a
] [formerly 16968223f2
[formerly 43a1786260e487f810489d0da3cb75dc0ce03d0a]]
Former-commit-id: 16968223f2
Former-commit-id: 5ba52f21bd
2013-02-27 09:21:56 -06:00
Ron Anderson
93382aeed8
Issue #1708 Fix redundant excution of evaluateQuery.
...
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a
Former-commit-id: 2212f333a3
[formerly a5a273c1c2
] [formerly 274ce762d8
[formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]
Former-commit-id: 274ce762d8
Former-commit-id: 84bd642290
2013-02-26 19:00:56 -06:00
Ron Anderson
541557e0b0
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: d43afc8c67
[formerly bfe3c684df
] [formerly f37999b1eb
[formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]
Former-commit-id: f37999b1eb
Former-commit-id: 77fbbb6a61
2013-02-26 18:44:51 -06:00
Nate Jensen
652ac25d12
Merge "Issue #1642 : Fix QPID Deadlock scenario - Address peer review comments" into development
...
Former-commit-id: a020438c99
[formerly 58957d30e5
] [formerly 24c94ef55b
[formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]
Former-commit-id: 24c94ef55b
Former-commit-id: b6fc51a18c
2013-02-26 18:00:50 -06:00
Richard Peter
ea806139d3
Issue #1642 : Fix QPID Deadlock scenario
...
- Address peer review comments
Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462
Former-commit-id: 7d4206420c
[formerly 9a0177861f
] [formerly 5b2650599d
[formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]
Former-commit-id: 5b2650599d
Former-commit-id: 4deaf372a1
2013-02-26 16:01:25 -06:00