Bryan Kowal
7f7644be1e
Issue #1927 - fixed CAVE rpm dependency determination
...
Former-commit-id: 79e22d6770
[formerly 79e22d6770
[formerly cc1a0ed662343a382f992bd43ba3b78c11cfd78b]]
Former-commit-id: 988fbfc8ad
Former-commit-id: c30292262a
2013-04-19 08:36:10 -05:00
Lee Venable
39adf1bae0
Merge "Issue #1790 Changes for non-blocking CountyStateDlg." into development
...
Former-commit-id: cf1347c380
[formerly cf1347c380
[formerly 839e6d466d59e78d906380d742ea1999ff1115c0]]
Former-commit-id: 95b3e0dd4b
Former-commit-id: 8444e9ff54
2013-04-18 14:42:48 -05:00
Dustin Johnson
1b83f30cdb
Merge "Issue #1914 Add email notification as a notification listener" into development
...
Former-commit-id: b593a2581c
[formerly b593a2581c
[formerly 1c6174bde3598fbe3b22aefb1c36a3a49968466b]]
Former-commit-id: 4f60e45094
Former-commit-id: 2c28b53ea4
2013-04-18 13:25:57 -05:00
Dustin Johnson
cf29290348
Issue #1914 Add email notification as a notification listener
...
Amend: Fix broken test
Change-Id: I3b692255b5d84fffce174c0447970fe627f4a61e
Former-commit-id: 74a9b93d05
[formerly 74a9b93d05
[formerly 45b5a9cffd6c57dc8ea1355ee623fcf6014dd377]]
Former-commit-id: 067b20c684
Former-commit-id: 7b09a0e477
2013-04-18 12:57:38 -05:00
Nate Jensen
56b4132856
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: 8f04f5329c
[formerly 8f04f5329c
[formerly 2a198f5f3c8476888f2ea12679c1eb54f0b41c84]]
Former-commit-id: b8719b47c6
Former-commit-id: ad10365a43
2013-04-18 12:31:39 -05:00
Dustin Johnson
48bd9cad66
Merge "Issue #1914 Add plugin based registry notification" into development
...
Former-commit-id: 1edba0cdc6
[formerly 1edba0cdc6
[formerly 0b7539d488388f4f96af0ccf97f5651c8e7d8259]]
Former-commit-id: 67eb771ccb
Former-commit-id: 375221e524
2013-04-18 11:00:57 -05:00
Benjamin Phillippe
26a762690a
Issue #1905 Implemented registry notifications via email
...
Change-Id: I2753074c302d707066ac0de42ac5b0778049275d
Former-commit-id: a525a1430c
[formerly a525a1430c
[formerly e8dba1178491176da3543a46c0d543c489b5fcb1]]
Former-commit-id: 7e6b8eedca
Former-commit-id: 9742cc996f
2013-04-18 10:19:12 -05:00
Roger Ferrel
e4e92dfa8d
Issue #1790 Changes for non-blocking CountyStateDlg.
...
Change-Id: I101202dbe8f5c1fdd9bac9b86a629960d9681e7d
Former-commit-id: 910adae4ee
[formerly 910adae4ee
[formerly a1b5f0b08a08bed1b76f81094970594aeae0a1f3]]
Former-commit-id: 9c428385ee
Former-commit-id: 04cd4f7f37
2013-04-18 07:49:08 -05:00
Dustin Johnson
0bf75efca4
Issue #1914 Add plugin based registry notification
...
Change-Id: Ie450b60683e4c317ac19628cb923310b828747a7
Former-commit-id: 91fe9ea501
[formerly 91fe9ea501
[formerly c75a5f6664b3c6d79773f4eda52ce03dfb5ba877]]
Former-commit-id: 8989c09566
Former-commit-id: 0e1994a03c
2013-04-17 12:17:23 -05:00
Max Schenkelberg
2e5c1a7c32
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: bd52681be3
[formerly bd52681be3
[formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]
Former-commit-id: 7513e5982b
Former-commit-id: 57f34e9080
2013-04-17 11:42:46 -05:00
Roger Ferrel
5eeaecd8a1
Issue #1790 Changes for non-blocking ArealDefinitionsDlg, CoopAgencyOfficeDlg, CopyNewLocationDlg and BenchmarkDlg.
...
Change-Id: Ie4b0cbe02f0ba74ec6678acb20c9d085b08a4cea
Former-commit-id: 3f79090c6b
[formerly 3f79090c6b
[formerly f3eb94989b149efb8651f37d2171615829eabf9d]]
Former-commit-id: 5d23b6a450
Former-commit-id: 96e603043a
2013-04-17 10:43:32 -05:00
Roger Ferrel
5766931c23
Issue #1790 Changes for non-blocking AdministrationDlg.
...
Change-Id: Iec8d71c747ef5167cd49909caba33176519cd07d
Former-commit-id: e8093a3a56
[formerly e8093a3a56
[formerly aa671a4bcfbd26ade407a8e52c6fe5eac69eb83f]]
Former-commit-id: 0194324742
Former-commit-id: f3da79e406
2013-04-16 16:34:00 -05:00
Roger Ferrel
cca9aca98b
Issue #1790 Changes for non-blocking AddModifyLocationDlg.
...
Change-Id: Ice2d3a8bbeaff0689d2b4e0a2ba8bbee017fb080
Former-commit-id: 3c42ad8145
[formerly 3c42ad8145
[formerly 8e78b6799404059032f10b97e62d385e07852c53]]
Former-commit-id: f410ee5f89
Former-commit-id: f576747b38
2013-04-16 15:54:02 -05:00
Roger Ferrel
30dd322db4
Issue #1790 Changes for non-blocking ForecastAttributeDlg.
...
Change-Id: I3724d165f721f9664f69ede09864a9714e35405b
Former-commit-id: 2b2dabdc71
[formerly 2b2dabdc71
[formerly f4d3fdda15d34a454887c9a14b6deada7a698141]]
Former-commit-id: c1b7b2e3bd
Former-commit-id: 1f0b994b9a
2013-04-16 14:44:03 -05:00
Roger Ferrel
c1e1f3786f
Issue #1790 Changes for non-blocking StationReportingStatusDlg.
...
Change-Id: Icd11c338c2bc7399c10205d10d3c11ff034d61d7
Former-commit-id: 1ba7a11037
[formerly 1ba7a11037
[formerly ec789fc71009b77d6f44b7eba606ba5259d253a8]]
Former-commit-id: af0aa091f3
Former-commit-id: 2020d82599
2013-04-16 12:51:18 -05:00
Dustin Johnson
522549fc3a
Issue #1910 Add some tests of the LifecycleManager SubmitObjects functionality
...
Change-Id: Ieb1544cb52cf108836b157e3d800c470fa5cf3e1
Former-commit-id: 255aea053b
[formerly 255aea053b
[formerly c4344f5402fe33e7e47515adc3b54913f9c13617]]
Former-commit-id: 58b6899672
Former-commit-id: cb899b3fa0
2013-04-16 11:30:06 -05:00
Dustin Johnson
8095deee57
Issue #1906 Remove new registry plugin from datadelivery feature
...
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598
Former-commit-id: c8241840c5
[formerly c8241840c5
[formerly 71b4bb07870f5490d89a1fe657429444c54a2689]]
Former-commit-id: 977702e876
Former-commit-id: 8170693941
2013-04-16 10:36:56 -05:00
Dustin Johnson
6302ad04b4
Issue #1906 Remove use of hibernate columnDefinition from SubscriptionType
...
Change-Id: I310914180865ca65290c48dc1c55f9dc11f3c044
Former-commit-id: 391a7bb999
[formerly 391a7bb999
[formerly 67ff37feac0998378a30c09894fab7ea0dbd84f8]]
Former-commit-id: 8b38dec4bb
Former-commit-id: 80ff75c473
2013-04-16 08:08:47 -05:00
Nate Jensen
2eaf49612c
Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development
...
Former-commit-id: 0cbf561f7c
[formerly 0cbf561f7c
[formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]
Former-commit-id: d411aad285
Former-commit-id: 9d0e3fd0c2
2013-04-15 14:57:03 -05:00
Matt Nash
a2e421048c
Issue #1870 add package-info.java so that the empty src directory gets pushed to git
...
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840
Former-commit-id: 0d12fb16bc
[formerly 0d12fb16bc
[formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]
Former-commit-id: 4b896002ac
Former-commit-id: 87af6d2809
2013-04-15 14:53:07 -05:00
Lee Venable
e1c360ca37
Merge "Issue #1904 - FFMPConfig no longer able to be reset." into development
...
Former-commit-id: c5c885b28b
[formerly c5c885b28b
[formerly 72178a388b7114f92146ba7fbb1eb062cbeb7aa4]]
Former-commit-id: 770f473bf7
Former-commit-id: 668a5133f6
2013-04-15 13:11:34 -05:00
Mike Duff
5253e6e535
Issue #1904 - FFMPConfig no longer able to be reset.
...
Change-Id: I9e7a7628ca1cd77964574fbc84c2cd2f78364872
Former-commit-id: 18e5561dd2
[formerly 18e5561dd2
[formerly 5775e40e5f939ca847527ae562cba71dc3984a60]]
Former-commit-id: f9c0de442f
Former-commit-id: c0f6fe5199
2013-04-15 13:02:58 -05:00
Dustin Johnson
a66aceef23
Merge "Issue #1802 Implemented ebxml registry replication" into development
...
Former-commit-id: 4276b4efa1
[formerly 4276b4efa1
[formerly 51fea5de5df2ff5ad2169614fb6f4d64ea586c6b]]
Former-commit-id: 52095664e0
Former-commit-id: fdf0f29feb
2013-04-15 12:42:23 -05:00
Bryan Kowal
fa59505e28
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: cca3f43736
[formerly cca3f43736
[formerly d0fe712b37f7890c547470b24139635183ee9e1e]]
Former-commit-id: c797715efe
Former-commit-id: 671e600a62
2013-04-15 09:40:43 -05:00
Benjamin Phillippe
d9b5511b8b
Issue #1802 Implemented ebxml registry replication
...
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531
Former-commit-id: 120906de78
[formerly 120906de78
[formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]
Former-commit-id: ec69cdeb44
Former-commit-id: c0099a8a39
2013-04-12 11:27:45 -05:00
Nate Jensen
0b2851bb05
Merge "Issue #1871 convert parameters to Strings and make sure to return them" into development
...
Former-commit-id: e8218d0e3c
[formerly e8218d0e3c
[formerly e9df9576305b7d58b92de6917675f8c38c020270]]
Former-commit-id: fe163c5c16
Former-commit-id: e6a24551af
2013-04-12 09:31:52 -05:00
Matt Nash
6969b0c0ae
Issue #1871 convert parameters to Strings and make sure to return them
...
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7
Former-commit-id: cd77308fac
[formerly cd77308fac
[formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]
Former-commit-id: 6c488cee05
Former-commit-id: 7dd72ab7d5
2013-04-12 09:31:23 -05:00
Matt Nash
7b25f73a9a
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: 3af61d7117
[formerly 3af61d7117
[formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]
Former-commit-id: b44ee44664
Former-commit-id: c95e825d35
2013-04-12 09:31:16 -05:00
Matt Nash
af190ad278
Issue #1871 make Java data access class better match Python version
...
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051
Former-commit-id: 68c84fd8cc
[formerly 68c84fd8cc
[formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]
Former-commit-id: 4ac6480f52
Former-commit-id: 7ffd8efcf2
2013-04-12 09:31:07 -05:00
Nate Jensen
7c22745ac0
Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
...
Former-commit-id: 36ad161721
[formerly 36ad161721
[formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]
Former-commit-id: 8561b201d5
Former-commit-id: 826e64a990
2013-04-12 09:30:38 -05:00
Matt Nash
d6feca69b4
Issue #1870 implement PathManager interface in Python to allow Python code to
...
get files
Change-Id: I0192c996533b1539194aaeba0213074bef8a4717
Former-commit-id: bf01f50e17
[formerly bf01f50e17
[formerly e3df8efa51ad95c952318b59edca702157a59856]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: caf1f1fdf7
2013-04-12 07:55:56 -05:00
Dustin Johnson
66136037bb
Merge "Issue #1891 Fix sorting in pending subscription table" into development
...
Former-commit-id: 355e654c1e
[formerly 355e654c1e
[formerly f1360b8ef80c343ad16b2345c500ea48c17ba209]]
Former-commit-id: d117a40e7c
Former-commit-id: d149e51484
2013-04-10 14:50:14 -05:00
Dustin Johnson
6ee0d474f8
Issue #1891 Fix sorting in pending subscription table
...
Amend: Rename getRowData() to getDisplayData()
Change-Id: Icc433f289d87273524468d0cf4e1bc799df134aa
Former-commit-id: d9544f3b73
[formerly d9544f3b73
[formerly b37624ebadc626e3dc30f669881d0b7bb87a7c45]]
Former-commit-id: 36cdd94a65
Former-commit-id: f7505eefc2
2013-04-10 14:04:55 -05:00
Max Schenkelberg
0b2fed1f34
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: 6e70b21f5f
[formerly 6e70b21f5f
[formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]
Former-commit-id: b695de3698
Former-commit-id: f2a0f8223a
2013-04-10 10:04:17 -05:00
Dustin Johnson
0857b2766c
Issue #1841 Update delta script for renaming PendingSubscription to PendingUserSubscription.
...
Change-Id: Ie1e485a5b8f5bce3032806fe3b0f4e78d46f93e6
Former-commit-id: bba3563265
[formerly bba3563265
[formerly d2a1704aa98f03086f7a07e416aa6aaea1d36121]]
Former-commit-id: ce96090763
Former-commit-id: 08a08803fe
2013-04-09 11:43:53 -05:00
Dustin Johnson
b61292ce4d
Issue #1826 Remove delivery/notify options for subscriptions
...
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509
Former-commit-id: 11fd2d676b
[formerly 11fd2d676b
[formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]
Former-commit-id: 6bc69df127
Former-commit-id: b78f56f1ca
2013-04-09 11:40:25 -05:00
Dustin Johnson
fefc0dca3b
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: 61346b1388
[formerly 61346b1388
[formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]
Former-commit-id: f3bdede2c8
Former-commit-id: 8c52cd190f
2013-04-05 12:41:02 -05:00
Bryan Kowal
c97dccb62d
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 52be309cac
[formerly 52be309cac
[formerly 9dc700dbf0d7ff8347fda64bdd60879c267dd2f4]]
Former-commit-id: dc522ede44
Former-commit-id: 04e22df174
2013-04-04 16:16:53 -05:00
Greg Armendariz
d176c441e7
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: d6d0e0131f
[formerly d6d0e0131f
[formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]
Former-commit-id: 71d400e09f
Former-commit-id: d463555ca3
2013-04-04 13:00:39 -05:00
Bryan Kowal
dda6a904ed
Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
...
Former-commit-id: 3fac666de5
[formerly 3fac666de5
[formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]
Former-commit-id: 64c54f2110
Former-commit-id: 49ee55327d
2013-04-04 12:48:59 -05:00
Steve Harris
7c3bfa901b
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: 56410d2a04
[formerly 56410d2a04
[formerly 6e7c89a07a4105097de3ffa1b7522fdae93baa5b]]
Former-commit-id: 731ed52cd6
Former-commit-id: a419f72b2d
2013-04-04 12:01:23 -05:00
Steve Harris
7eda24c3b0
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 8b607f8228
[formerly 8b607f8228
[formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: ed8c0487fe
2013-04-04 11:58:50 -05:00
Steve Harris
f0918ec8ad
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
...
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: ea34b1db1e
[formerly ea34b1db1e
[formerly 735ce03302b54116c8545daf043585fb16fabd11]]
Former-commit-id: d98a119f4d
Former-commit-id: 1a91fd82ff
2013-04-04 11:12:22 -05:00
Bryan Kowal
bd47c62789
Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
...
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6
Former-commit-id: 03a2e82b77
[formerly 03a2e82b77
[formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 5816ddaf77
2013-04-03 18:27:10 -05:00
Nate Jensen
5be8ef079e
Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
...
Former-commit-id: 79a9d76915
[formerly 79a9d76915
[formerly eaabe1a4935051d003ed302de193cfb183118845]]
Former-commit-id: 73d86e8926
Former-commit-id: c87d157cbd
2013-04-03 17:28:49 -05:00
Steve Harris
eb5258f043
13.2.1-21 baseline
...
Former-commit-id: d4358b93dc
[formerly d4358b93dc
[formerly f80eddbb15e5ca1710c15d245957345d6f840546]]
Former-commit-id: 33bd359cfe
Former-commit-id: 18d6fa4f4d
2013-04-03 18:08:41 -04:00
Steve Harris
9c51f2d15f
13.2.1-20 baseline
...
Former-commit-id: 6a55bc5dff
[formerly 6a55bc5dff
[formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]
Former-commit-id: 539faf0a71
Former-commit-id: 12d4316b3a
2013-04-03 18:05:39 -04:00
Steve Harris
f22108c973
Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
...
Former-commit-id: 0f000f4485
[formerly 0f000f4485
[formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]
Former-commit-id: 327d05f3b5
Former-commit-id: c7b9690456
2013-04-03 15:52:19 -05:00
Ron Anderson
fb76bf6d49
Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1
...
Former-commit-id: de856db77a
[formerly de856db77a
[formerly 53ace4843058424627c3b670caa77972ddbe01be]]
Former-commit-id: c82968c1e6
Former-commit-id: 237e414b5d
2013-04-03 15:25:52 -05:00
Richard Peter
0548ee285d
Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
...
Former-commit-id: d282a49b6f
[formerly d282a49b6f
[formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]
Former-commit-id: 6d73e25290
Former-commit-id: 64dc5c4d23
2013-04-03 15:14:17 -05:00