mjames-upc
0b01029e68
cleaning up unidata_15.1.1 enough to launch in eclipse
2015-12-29 20:15:31 -07:00
AWIPS User
f2784946f8
empty the thin client blacklist text file. add -component thinclient to developer.product permanently to run local caching.
...
Former-commit-id: df515672ce
[formerly abe5dc0411
] [formerly bd273b43a5721986d0e0126d053666d4f9683c63 [formerly f4a9c43c8d
]]
Former-commit-id: 1635019e12a166032dab435f97d5629c84229dd7 [formerly c1908a5adc
]
Former-commit-id: adb49f0c9a
2015-07-08 18:55:01 -06:00
AWIPS User
7fdb57c96c
ui frame increase/d2d for developer.product/test file regex for obs and radar.
...
Former-commit-id: 86a579e940
[formerly e3d9d5602f
] [formerly 3938673621f8cdfbd6a1e1dca7c3c4db21cccf4e [formerly 7b803d9c61
]]
Former-commit-id: f2772294e59c1ecf4b52e77b3c2cf77d3ed54161 [formerly 283ffab705
]
Former-commit-id: ceab543656
2015-06-22 16:00:26 -05:00
AWIPS User
ea30abe01b
merge upc development orphan branch into upc_14.4.1
...
Former-commit-id: 4458299928
[formerly 06a7f2ad9d
] [formerly 1f4613a97ecb170f991ddd5ca9be32b5c63945b0 [formerly c9f28fd594
]]
Former-commit-id: 76393e9e3ea8a386189eecfc4953a49d04ba95df [formerly 892c265b12
]
Former-commit-id: 1ac670fc00
2015-03-01 12:44:45 -07:00
mjames-upc
f53102344e
NCP perspective default for developer.product
...
Former-commit-id: f1794d9742
2015-01-12 16:45:33 -07:00
mjames-upc
ba80d4303b
modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development
...
Former-commit-id: e104fc35e2
2015-01-12 14:07:28 -07:00
mjames-upc
af37bea025
LDM RPM build post install file edits. build version and CAVE IDE max memory increase
...
Former-commit-id: e260556e9b
2015-01-03 13:51:19 -07:00
Dave Hladky
61d25613ab
Omaha #3757 Added HTTPS flag
...
Former-commit-id: 7848dc4df9ef8faafdce556836bc71c789b74ee4
2014-12-10 17:17:12 -06:00
Dave Hladky
c9b9e5105b
Omaha #3757 Added HTTPS flag
...
Former-commit-id: 379ba3c51d
[formerly a69c83e534
] [formerly 61d25613ab
] [formerly 379ba3c51d
[formerly a69c83e534
] [formerly 61d25613ab
] [formerly 337f67b136
[formerly 61d25613ab
[formerly 7848dc4df9ef8faafdce556836bc71c789b74ee4]]]]
Former-commit-id: 337f67b136
Former-commit-id: e359f2e964
[formerly 7d58dacbba
] [formerly 3d9e9d54499f054222096d3dbfcee752e01f5b8e [formerly 0e15b23b5f
]]
Former-commit-id: 1e4d972c847cd8896d5bc27f9670ce81727c17c3 [formerly d5280b3cae
]
Former-commit-id: b0468116f5
2014-12-10 17:17:12 -06:00
Nate Jensen
584297e2aa
Omaha #3300 undo bad product file that merged from pda branch
...
Change-Id: I5425e002fcdbc78db66644dd04022767fae0acbd
Former-commit-id: 6155a8f3d541ee05d4d2f99cdd211e521d4ed19b
2014-12-01 12:19:14 -06:00
Nate Jensen
0130daf47a
Omaha #3300 undo bad product file that merged from pda branch
...
Change-Id: I5425e002fcdbc78db66644dd04022767fae0acbd
Former-commit-id: 71ec650107
[formerly fa378abf2a
] [formerly 584297e2aa
] [formerly 71ec650107
[formerly fa378abf2a
] [formerly 584297e2aa
] [formerly ad8aadf385
[formerly 584297e2aa
[formerly 6155a8f3d541ee05d4d2f99cdd211e521d4ed19b]]]]
Former-commit-id: ad8aadf385
Former-commit-id: 6840078170
[formerly ec05762f89
] [formerly b902db841902e770d57ddd5b11fae760c39f4958 [formerly bf4e3b56d3
]]
Former-commit-id: caea1fc170bb2b9e30fd27d60c03c2847b22dfcf [formerly 4048b90428
]
Former-commit-id: 223f259943
2014-12-01 12:19:14 -06:00
mjames-upc
cbf3fa37a8
build updates: binlightning removed from feature.uframe, flag added to *.product to fix cairo/GTK crashing Java on RHEL 6.6, default modes updated to remove datadelivery from ingest JVM
...
Former-commit-id: 78c6975fea
2014-11-21 11:33:26 -07:00
Nate Jensen
95d510849a
Omaha #3549 improve performance of DataStoreResource processing of
...
requests
Change-Id: Ica72cded45aff23737c4b2aab8bbe94e0fc99755
Former-commit-id: bab091169dff1383a3b78ea4b94ec67d446e5f80
2014-11-18 15:22:09 -06:00
Nate Jensen
167af39978
Omaha #3549 improve performance of DataStoreResource processing of
...
requests
Change-Id: Ica72cded45aff23737c4b2aab8bbe94e0fc99755
Former-commit-id: 4a2e27b5c0
[formerly 5d6dae89f2
] [formerly 95d510849a
] [formerly 4a2e27b5c0
[formerly 5d6dae89f2
] [formerly 95d510849a
] [formerly 089292dbd0
[formerly 95d510849a
[formerly bab091169dff1383a3b78ea4b94ec67d446e5f80]]]]
Former-commit-id: 089292dbd0
Former-commit-id: 5d8f2b36c0
[formerly 80a5beed26
] [formerly e8da6c3a553b395144fab186655330fcdad7f93d [formerly 5de7b5ec07
]]
Former-commit-id: a50a26c7331a6246f6c6883465019964db1fd19e [formerly 764e724298
]
Former-commit-id: 67aa47351c
2014-11-18 15:22:09 -06:00
Dave Hladky
b954a12e79
Omaha #3132 merge in PDA into 14.4.1
...
Former-commit-id: 38944c601a800e96fbdd34d51034bb7e42ae4a27
2014-11-06 09:48:54 -06:00
Dave Hladky
d8bd453375
Omaha #3132 merge in PDA into 14.4.1
...
Former-commit-id: 42338b40d3
[formerly 23f945bad9
] [formerly b954a12e79
] [formerly 42338b40d3
[formerly 23f945bad9
] [formerly b954a12e79
] [formerly ef29e2883c
[formerly b954a12e79
[formerly 38944c601a800e96fbdd34d51034bb7e42ae4a27]]]]
Former-commit-id: ef29e2883c
Former-commit-id: 4407ad0ee3
[formerly df8a326878
] [formerly c8943a493602dc93a62b5278c0c885f21df8a2bf [formerly d4edc92ec5
]]
Former-commit-id: 409d11f03cffe41a2d01278020cafc872872150a [formerly 750200f237
]
Former-commit-id: 2d38aa6ada
2014-11-06 09:48:54 -06:00
Ben Steffensmeier
2c9d16911a
Omaha #3744 Adjust cave g1 region size.
...
Former-commit-id: a60888ed9e08f3bb56f39ef287bb6d02a49d3241
2014-10-22 10:30:33 -05:00
Ben Steffensmeier
11fd233962
Omaha #3744 Adjust cave g1 region size.
...
Former-commit-id: 9e764dfc8c
[formerly 1a1fafb08a
] [formerly 2c9d16911a
] [formerly 9e764dfc8c
[formerly 1a1fafb08a
] [formerly 2c9d16911a
] [formerly 19ccfa6633
[formerly 2c9d16911a
[formerly a60888ed9e08f3bb56f39ef287bb6d02a49d3241]]]]
Former-commit-id: 19ccfa6633
Former-commit-id: 52386b42c7
[formerly 3117cdd13c
] [formerly 56685761f98ac298ed2e4af6b94057857b4310d8 [formerly d5c85324d8
]]
Former-commit-id: fa006470a1b7e8d5faf737e2d19ca8d5f5997ba5 [formerly 46e3e3b7d9
]
Former-commit-id: f7bff32ffe
2014-10-22 10:30:33 -05:00
Nate Jensen
799ba1babf
Omaha #3678 don't enable jmx at alertviz or cave startup
...
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 501aa1ac560f34024ab906391dc8c22c422d8509
2014-10-01 09:46:56 -05:00
Nate Jensen
0e57a71184
Omaha #3678 don't enable jmx at alertviz or cave startup
...
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 8c3c592190
[formerly 131f5ec9f7
] [formerly 799ba1babf
] [formerly 8c3c592190
[formerly 131f5ec9f7
] [formerly 799ba1babf
] [formerly 41427a57bb
[formerly 799ba1babf
[formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]]
Former-commit-id: 41427a57bb
Former-commit-id: 0b0b9900fe
[formerly e6100e8e7f
] [formerly 8b3857e4c194aa2076e394aa0028ebf5c0ba2ab8 [formerly 78054658a3
]]
Former-commit-id: eac63f07f79044de4bb76979473040b0e13d3b46 [formerly 86271d7dc9
]
Former-commit-id: 18f7a6f1c0
2014-10-01 09:46:56 -05:00
mjames-upc
24db38800b
perspective plugin.xml edits
...
Former-commit-id: d66c48501b
2014-09-22 15:04:40 -06:00
mjames-upc
074aefd47b
feature updates for warngen putback
...
Former-commit-id: 382f22f438
2014-09-10 15:09:58 -06:00
mjames-upc
717e4b3388
CAVE feature set updates
...
Former-commit-id: 1b59839a0c
2014-07-23 12:43:26 -06:00
mjames-upc
f3dc477ecd
httpd.conf group edit. .product updates. edex service manager edits.
...
Former-commit-id: fc5c156fcc
2014-07-09 15:24:10 -06:00
mjames-upc
6ff2d8fb47
more updates, mainly for RAP-13km attribute files
...
Former-commit-id: 4afd4a1840
2014-07-06 19:24:17 -06:00
Richard Peter
46f42687e2
Omaha #3274 Tweak G1 Flags for Cave
...
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: e16fd779239a09735d6ea092058a39bc7263b2f1
2014-06-26 17:46:57 -05:00
Richard Peter
99c550709e
Omaha #3274 Tweak G1 Flags for Cave
...
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: 1a472d4b2e
[formerly 6bc89f2420
] [formerly 46f42687e2
] [formerly 1a472d4b2e
[formerly 6bc89f2420
] [formerly 46f42687e2
] [formerly 56389ef395
[formerly 46f42687e2
[formerly e16fd779239a09735d6ea092058a39bc7263b2f1]]]]
Former-commit-id: 56389ef395
Former-commit-id: bcf92a4b08
[formerly 2d18721bd6
] [formerly 395291351cc63f90d7019e4eb6186c1ef830f36e [formerly 5112bbb8d5
]]
Former-commit-id: 40b5d58c95a8b7c0f6129a2b1c88baa2f6af8cdf [formerly c5003ff6c4
]
Former-commit-id: 7daa1ed24b
2014-06-26 17:46:57 -05:00
Nate Jensen
4a91c3320b
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 0355813f030ac996427c64dfcb6cbd4dd781ad2f
2014-06-17 10:54:57 -05:00
Nate Jensen
3c62a1a906
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 172777137a
[formerly 14a520dbd9
] [formerly 4a91c3320b
] [formerly 172777137a
[formerly 14a520dbd9
] [formerly 4a91c3320b
] [formerly 44cb0e6ae6
[formerly 4a91c3320b
[formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: a115e851fb
[formerly 439e037d03
] [formerly a3713f79ee49f1e6f01c9ebf4f56ac3cf08b2e8c [formerly 3981241355
]]
Former-commit-id: b6228cb159c4073552fff5ecb789b070f81770b9 [formerly fe47ecf6ce
]
Former-commit-id: 54b72c7108
2014-06-17 10:54:57 -05:00
mjames-upc
df3f2fa30e
First build Unidata 14.2.1. Added directory rpms/unidata/ which includes current build script (adapted from NCEP) and custom environment file all based on /awips2 directory home for everything needed. Edits made to awips.product and developer.product to remove a perspective flag which was causing errors on RPM install. Qpid build for .7 added; edit made to build for .18. awips2-pgadmin RPM spec file updated to remove the stringent rhel6 package name and version requirements, allowing to install without error across different linux systems. Installer.topo edits for awipscm, the as-yet-un-committed shapefile directory that apparently is needed to build RPMs, but not included in the source (I had to extract the files from previously built RPMs in order to build the same RPM... bootstrap much?)
...
Former-commit-id: a88e08a7ac
2014-06-11 17:09:46 -06:00
mjames-upc
04907dbf39
okay lets just edit all of them to make sure, and because consistensy is a good thing and you will end up doing it anyway so why not now?
...
Former-commit-id: 1b1c7b621e
2014-05-16 20:11:08 -06:00
mjames-upc
b4c0da1971
first commit orphan branch from remotes/origin/ncep_14.2.1
...
Former-commit-id: 27eaf7aa70
2014-04-30 19:22:58 -06:00
Ben Steffensmeier
12ed63619a
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 8d8a06be12652349032f15ab1e31d5f23adf0b24
2014-03-05 14:57:28 -06:00
Ben Steffensmeier
0b48d33f0b
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 6dc44e895f
[formerly fd34cf3993
] [formerly 12ed63619a
] [formerly 6dc44e895f
[formerly fd34cf3993
] [formerly 12ed63619a
] [formerly 775c29e77c
[formerly 12ed63619a
[formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]]]
Former-commit-id: 775c29e77c
Former-commit-id: ceb056d304
[formerly 2bc8805fbc
] [formerly e70e825d566372eb4b060f189bea9a1c2b022f0d [formerly a06a98750f
]]
Former-commit-id: a89a30db3acd3cf5e17ecb35b2b039bc72f90b99 [formerly 3f62075baa
]
Former-commit-id: ab265087eb
2014-03-05 14:57:28 -06:00
Brian Clements
f9a8b68da5
Issue #2594 added low memory warning job
...
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files
Former-commit-id: 4af42d405d3bf24b00c027f5dab8faf500a9e5b7
2014-01-14 17:05:28 -06:00
Brian Clements
5754f15da4
Issue #2594 added low memory warning job
...
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files
Former-commit-id: 8d6a469928
[formerly c63c8e2fc6
] [formerly f9a8b68da5
] [formerly 8d6a469928
[formerly c63c8e2fc6
] [formerly f9a8b68da5
] [formerly 0076ec9aaf
[formerly f9a8b68da5
[formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: d53024b73f
[formerly 496d15d77f
] [formerly 99fc908864fba07455340f77fae46faf16981fcf [formerly e420ae009d
]]
Former-commit-id: a57d8088ab7dc4c9a4fed5bd5802e7dfc0a73d06 [formerly dd0c5d9b57
]
Former-commit-id: db92ac5b84
2014-01-14 17:05:28 -06:00
Max Schenkelberg
dda69d36b7
Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage
...
Amend: Added jgerth comment history back in
Change-Id: I08733fcf46f9bdcded1f609bcdd26459652edaef
Former-commit-id: 2e52921b21ecaeaa11be8277e264446686d65338
2013-08-06 12:37:52 -05:00
Max Schenkelberg
17c77a8cdc
Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage
...
Amend: Added jgerth comment history back in
Change-Id: I08733fcf46f9bdcded1f609bcdd26459652edaef
Former-commit-id: 9d590ce7f9
[formerly 7f4b63283d
] [formerly dda69d36b7
] [formerly 9d590ce7f9
[formerly 7f4b63283d
] [formerly dda69d36b7
] [formerly a18686135c
[formerly dda69d36b7
[formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]]
Former-commit-id: a18686135c
Former-commit-id: b5b121032d
[formerly 23b6e68e14
] [formerly 627430677d858453f22a1a0fc99838be1d3e97bc [formerly 75ae62fd9a
]]
Former-commit-id: 9c925a779c5403a930ff676af34fb0919f7d79fd [formerly 3d5f35d792
]
Former-commit-id: a691c86dc0
2013-08-06 12:37:52 -05:00
Max Schenkelberg
63421a4819
Issue #2142 Got log4j out of edex.
...
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
2013-07-15 14:26:15 -05:00
Max Schenkelberg
ad32bbd91d
Issue #2142 Got log4j out of edex.
...
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: cd88054e2b
[formerly 94fa6f0e30
] [formerly 63421a4819
] [formerly cd88054e2b
[formerly 94fa6f0e30
] [formerly 63421a4819
] [formerly 50825200a1
[formerly 63421a4819
[formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04
[formerly d1881ffa51
] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e
]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f
]
Former-commit-id: 5ba50b4476
2013-07-15 14:26:15 -05:00
Nate Jensen
316d6c09c6
Issue #2142 initial cutover from log4j to SLF4J and logback
...
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: 7725d8a6cd00b3c30856b48ef86ab081b67d400b
2013-07-01 14:41:05 -05:00
Nate Jensen
4f6c84f9bb
Issue #2142 initial cutover from log4j to SLF4J and logback
...
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: 338b0ae310
[formerly a4de603bcf
] [formerly 316d6c09c6
] [formerly 338b0ae310
[formerly a4de603bcf
] [formerly 316d6c09c6
] [formerly db6152e524
[formerly 316d6c09c6
[formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]]
Former-commit-id: db6152e524
Former-commit-id: cce5d8e8ff
[formerly 5a6b0f99cc
] [formerly 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c
]]
Former-commit-id: dedb130eb36dca918cdf2169d1ec2f249f45f829 [formerly efcf0c8519
]
Former-commit-id: 86b096bc9b
2013-07-01 14:41:05 -05:00
Nate Jensen
c2faa0e3bf
Issue #2102 improve error handling on thrift or http errors
...
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b
Former-commit-id: c38fb601bf4a360ab171e4d04f242e99f91710f2
2013-06-13 11:39:30 -05:00
Nate Jensen
d045893591
Issue #2102 improve error handling on thrift or http errors
...
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b
Former-commit-id: a7573825c6
[formerly f55b3cbdbe
] [formerly c2faa0e3bf
] [formerly a7573825c6
[formerly f55b3cbdbe
] [formerly c2faa0e3bf
] [formerly 0f6d897ff3
[formerly c2faa0e3bf
[formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: f173cc29e1
[formerly 4a39d586d2
] [formerly 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded
]]
Former-commit-id: 68961429c50b354dfaec2ba5f64aea79e2210876 [formerly 853f5c7546
]
Former-commit-id: c5d88a6dce
2013-06-13 11:39:30 -05:00
Steve Harris
998961612c
13.5.1-1 baseline
...
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
97a4c59662
13.5.1-1 baseline
...
Former-commit-id: 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly fe872355a7
[formerly 998961612c
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410
[formerly 0aab285b8a
] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e
]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940
]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
4c6ff79e71
13.4.1-7 baseline
...
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Steve Harris
a2c35a5f3f
13.4.1-7 baseline
...
Former-commit-id: 81bc07bff4
[formerly 8072752c77
] [formerly 4c6ff79e71
] [formerly 81bc07bff4
[formerly 8072752c77
] [formerly 4c6ff79e71
] [formerly 8347bed50e
[formerly 4c6ff79e71
[formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f
[formerly ff7a21ac37
] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661
]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc
]
Former-commit-id: c7c6ea343e
2013-05-13 12:58:10 -04:00
Steve Harris
0be473728a
13.3.1-12 baseline
...
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
fd735b8ff8
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0
[formerly be96282207
] [formerly 0be473728a
] [formerly 6f374b35d0
[formerly be96282207
] [formerly 0be473728a
] [formerly aaac0b51e5
[formerly 0be473728a
[formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300
[formerly f80f98cee2
] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f
]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a
]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00