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

2782 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nate Jensen
882296f823 Issue #1989 use camel's built-in DirectVm component 
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: 65b9bafed7 [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly 90397159ef98097da0754a846d1f67d4839a300d]]
Former-commit-id: d7b8e04bb7
Former-commit-id: 91c8b9ac1d
 2013-05-23 10:06:28 -05:00
Nate Jensen
5525412779 Issue #1989 fix clustered routes suspending/starting 
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: 57e560b745 [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]
Former-commit-id: a6d525ec96
Former-commit-id: 431e97742d
 2013-05-22 16:39:24 -05:00
Steve Harris
389eefd1f9 Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 570128b986 [formerly 8496832064] [formerly 3590310f17 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]
Former-commit-id: 3590310f17
Former-commit-id: 0f9e0b343d
 2013-05-22 16:13:08 -05:00
Steve Harris
026674d0b2 Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: dce0dc3692 [formerly 097617fa26] [formerly 462652e31e [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]
Former-commit-id: 462652e31e
Former-commit-id: 299690a202
 2013-05-22 16:10:04 -05:00
Steve Harris
b745b332ae 13.4.1-12 baseline 
Former-commit-id: 397bbf674a [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: e53ada66b8
Former-commit-id: bd4f93e859
 2013-05-22 16:42:39 -04:00
Benjamin Phillippe
8cae1b56f1 Issue #2022 Removed data delivery project from feature 
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd

Former-commit-id: 0308f217d6 [formerly 4d1252523e] [formerly 3e9fe9892e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]
Former-commit-id: 3e9fe9892e
Former-commit-id: ce20ead9e7
 2013-05-22 12:49:46 -05:00
David Gillingham
1471a7fa34 Issue #1759: Fix regression to ISC request reply due to missing import. 
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: 2555cf9819 [formerly 5cba0f5e40] [formerly 801c659108 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]
Former-commit-id: 801c659108
Former-commit-id: 60aeb71652
 2013-05-22 11:42:08 -05:00
Benjamin Phillippe
1c50a8b9d3 Issue #2022 Added registry federation capabilities 
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028

Former-commit-id: 7a908bbeaf [formerly b9f2bde20e] [formerly c3a376475b [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]
Former-commit-id: c3a376475b
Former-commit-id: ad039bae0c
 2013-05-22 11:38:42 -05:00
Richard Peter
1bbddf8fdf Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development 
Former-commit-id: 62c8176486 [formerly c9c1570960] [formerly b4344d3c04 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]
Former-commit-id: b4344d3c04
Former-commit-id: 489fdf49b1
 2013-05-21 13:07:51 -05:00
Greg Armendariz
cd96d6d2e6 Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development 
Former-commit-id: fce1512b37 [formerly 20a9ad95e5] [formerly eecbf2718a [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]
Former-commit-id: eecbf2718a
Former-commit-id: 525cd5c751
 2013-05-21 12:24:19 -05:00
Richard Peter
76f11f00ae Merge branch 'omaha_13.4.1' (13.4.1-11) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]
Former-commit-id: 930ff50fb8
Former-commit-id: 81ae3ea8bf
 2013-05-21 12:11:21 -05:00
Bryan Kowal
61a613b490 Issue #1952 - remove duplicate filesystem hierarchy 
Former-commit-id: e9abe7185b [formerly 4b8868ca54] [formerly 7027f97e2a [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]
Former-commit-id: 7027f97e2a
Former-commit-id: 62d21498a6
 2013-05-21 11:09:57 -05:00
Nate Jensen
0fc260728b Merge "Issue #2001 fix message handling" into development 
Former-commit-id: 8438eb1b4a [formerly 737b265c34] [formerly 4d519da3a9 [formerly 50ea25c2563c109b92e4251c05174b9b3d077909]]
Former-commit-id: 4d519da3a9
Former-commit-id: d2cccd342b
 2013-05-21 11:00:32 -05:00
Richard Peter
21b87e9ea7 Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: 4809b3c15b [formerly 73372622f7] [formerly 77a08ebd31 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]
Former-commit-id: 77a08ebd31
Former-commit-id: 427f54a878
 2013-05-21 10:35:00 -05:00
Nate Jensen
a06bb176ba Issue #2001 fix message handling 
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: 56309efafe [formerly 1ab118958f] [formerly 960bc6db69 [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]
Former-commit-id: 960bc6db69
Former-commit-id: e575c19ab6
 2013-05-21 10:26:18 -05:00
Nate Jensen
51a31a08ca Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development 
Former-commit-id: 18e6f84418 [formerly f16606cfba] [formerly d02ce9d389 [formerly a6b4bd31146009e3d958efde759408daec52d2f4]]
Former-commit-id: d02ce9d389
Former-commit-id: 80b1a9d18c
 2013-05-21 10:22:24 -05:00
Dustin Johnson
bd65447c9f Merge "Issue #2000 Subscription overlap configuration GUI" into development 
Former-commit-id: fef73ac960 [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]
Former-commit-id: 8fcc958d84
Former-commit-id: 5695c4f967
 2013-05-21 08:19:34 -05:00
Steve Harris
4d88863515 13.4.1-11 baseline 
Former-commit-id: d6319a2ca6 [formerly 2edee36158] [formerly c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]
Former-commit-id: c0376ce9ed
Former-commit-id: 6df093ef48
 2013-05-21 09:19:25 -04:00
Ben Steffensmeier
30eb486e45 Issue #1869 Rewrite dataURI property mappings. 
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: c11631c7da [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]
Former-commit-id: 931e76ae59
Former-commit-id: 5147eb18d4
 2013-05-20 18:00:32 -05:00
Richard Peter
72206676ee Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development 
Former-commit-id: 8b2ecd5771 [formerly e0740990ce] [formerly 59c38fdb78 [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]
Former-commit-id: 59c38fdb78
Former-commit-id: 8b7cf1beb8
 2013-05-20 17:49:22 -05:00
Roger Ferrel
4a5073902f Issue #1966 Interim changes Brad needs for his work. 
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

Former-commit-id: e3c06b643b [formerly 16c7de874a] [formerly dfd586fca6 [formerly 57a43dfefb79d49895beace44930db630cd502be]]
Former-commit-id: dfd586fca6
Former-commit-id: c9e6e367fe
 2013-05-20 17:43:47 -05:00
Ben Steffensmeier
a03dbd284b Issue #1869 Remove DataURI column from sat plot types. 
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb

Former-commit-id: aa3b8c80f4 [formerly 26e80bbd18] [formerly 885b106652 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]
Former-commit-id: 885b106652
Former-commit-id: 13b2b4afef
 2013-05-20 17:27:15 -05:00
Dustin Johnson
3a504d1e7b Issue #2000 Subscription overlap configuration GUI 
Amend:
  Peer review comments.

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 554347f17c [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]
Former-commit-id: 38249cd7b9
Former-commit-id: 7858a3b57f
 2013-05-20 17:12:47 -05:00
Bryan Kowal
07188502aa Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries 
- removed only python 2.5 native libraries
- removed old scripts utilized by IzPack


Former-commit-id: 5b6fa4e360 [formerly e4cdc64c07] [formerly 35be00792e [formerly cf94670fe9807a5253209da892f7305defaf32a8]]
Former-commit-id: 35be00792e
Former-commit-id: 13febf859e
 2013-05-20 16:58:56 -05:00
Bryan Kowal
3f20eed975 Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE. 
Former-commit-id: 081d1c724a [formerly 99ba7adfe7] [formerly e4874a873a [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]
Former-commit-id: e4874a873a
Former-commit-id: 31605b7a94
 2013-05-20 15:03:33 -05:00
Richard Peter
e03cf56895 Merge "Issue #1869 Remove DataURI column from qc." into development 
Former-commit-id: 8079561032 [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]
Former-commit-id: 3d861eca69
Former-commit-id: 0ced8c87e4
 2013-05-20 14:48:47 -05:00
Steve Harris
7e04d8cd13 13.4.1-10 baseline 
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 92152778b9
Former-commit-id: b1fc4e625b
 2013-05-20 10:52:47 -04:00
Bryan Kowal
a52363e2df Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java 
Former-commit-id: db9b06cc9d [formerly d8ce0f369c] [formerly a070d28ecc [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]
Former-commit-id: a070d28ecc
Former-commit-id: 7dd9b1e1c0
 2013-05-17 18:21:03 -05:00
Richard Peter
aff520d61b Merge branch 'omaha_13.4.1' (13.4.1-9) into development 
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]
Former-commit-id: a9869f07ba
Former-commit-id: c47eb36e43
 2013-05-17 10:33:18 -05:00
Bryan Kowal
5d21fa1fd7 Issue #1927 - handle common base until new build implementation 
Former-commit-id: 84c3c114a9 [formerly 63f57de31f] [formerly 79816de308 [formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]
Former-commit-id: 79816de308
Former-commit-id: 9ea4bab577
 2013-05-16 23:56:47 -05:00
Max Schenkelberg
7ce0b7ef13 Issue #1638 Fixed updates for resource datas that override update without checking update object 
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: 4d435d3dd5 [formerly c421240835] [formerly d07de0870f [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]
Former-commit-id: d07de0870f
Former-commit-id: a94469df82
 2013-05-16 18:04:26 -05:00
Nate Jensen
7f58e8a568 Merge "Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource." into development 
Former-commit-id: 9a3f855a1a [formerly 39543d7ee0] [formerly 6ef214f1b8 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]
Former-commit-id: 6ef214f1b8
Former-commit-id: ffa74c3bdb
 2013-05-16 18:02:20 -05:00
Ben Steffensmeier
777f12fbad Issue #1869 Remove DataURI column from qc. 
Former-commit-id: 89b4bd571a [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]
Former-commit-id: f2b11b8a49
Former-commit-id: 6353b7e04b
 2013-05-16 17:48:37 -05:00
Nate Jensen
7fb7c68b89 Merge "Issue #1989 disable camel JMX to speed up edex" into development 
Former-commit-id: 0704a0a610 [formerly a5372205e6] [formerly b710a7c288 [formerly d9e7d87f7eb454e66ecd42446544fcec473e95b6]]
Former-commit-id: b710a7c288
Former-commit-id: e7001cfba5
 2013-05-16 17:33:18 -05:00
Nate Jensen
b57c84d12b Issue #1989 disable camel JMX to speed up edex 
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: bc8d798973 [formerly bfcdcb607a] [formerly d905453660 [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]
Former-commit-id: d905453660
Former-commit-id: c3bafc88cd
 2013-05-16 17:13:46 -05:00
Steve Harris
b5d3ff1867 Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: 87a31f9990 [formerly 16ba74496d] [formerly b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]
Former-commit-id: b76d359695
Former-commit-id: 26664e6615
 2013-05-16 13:45:58 -05:00
Bryan Kowal
88cc3a6011 Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds 
- The new p2 director is not able to install zipped repositories; so, each repository
  is now unzipped before installation during the CAVE Assembly phase of the Windows
  32-bit build
- Adjusted the order of the p2 repositories are built so Windows will install them
  in the correct order during the CAVE Assembly phase of the Windows 32-bit build


Former-commit-id: dccc6e4a96 [formerly 7e849f0af3] [formerly 22d4494918 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]
Former-commit-id: 22d4494918
Former-commit-id: 560fb81038
 2013-05-16 11:01:40 -05:00
Bryan Kowal
3812567894 Issue #2006 - qpid is now compatible with the upgraded FOSS libraries. 
Former-commit-id: 17101171b6 [formerly 1e726506e0] [formerly 39b12ee0fb [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]
Former-commit-id: 39b12ee0fb
Former-commit-id: 37461e68dd
 2013-05-16 11:00:47 -05:00
Max Schenkelberg
a3ad1c7c45 Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource. 
Amend: Corrected ticket number

Change-Id: Ice336b6b4fb286dd4905f43b6f16259f23dea0c6

Former-commit-id: 62efca5041 [formerly 67e0d17aed] [formerly 8b4d47c690 [formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]
Former-commit-id: 8b4d47c690
Former-commit-id: 0038138fdc
 2013-05-16 10:54:52 -05:00
Nate Jensen
53f994c0a8 Issue #1989 remove dead files 
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: 9f8654e4ff [formerly 1ecdd989df] [formerly ce2579a289 [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]
Former-commit-id: ce2579a289
Former-commit-id: 04c7c4a4da
 2013-05-16 10:25:38 -05:00
Bryan Kowal
c03d61587c Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment 
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e

Former-commit-id: 2149099abb [formerly 11c93f548e] [formerly 43ec909008 [formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]
Former-commit-id: 43ec909008
Former-commit-id: 97cff7bf9c
 2013-05-16 10:21:11 -05:00
Bryan Kowal
8cba03d5a5 Issue #1872 - merge 2002; do not include .gitignore files in the rpm 
Former-commit-id: c83d93b527 [formerly b0122e794e] [formerly 20fd227d99 [formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]
Former-commit-id: 20fd227d99
Former-commit-id: 7ec8600dc1
 2013-05-16 10:19:31 -05:00
Steve Harris
67a95d07d2 13.4.1-9 baseline 
Former-commit-id: 88eee9cbfa [formerly bcf7f15c90] [formerly aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: aff41713f9
Former-commit-id: 0766ae20dd
 2013-05-16 11:12:07 -04:00
Nate Jensen
1355010c38 Merge "Issue #1989 removing dead plugins from repo" into development 
Former-commit-id: 5b4c91d734 [formerly 03f93712a2] [formerly 367784bd99 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]
Former-commit-id: 367784bd99
Former-commit-id: e4b47d1eb9
 2013-05-16 09:27:48 -05:00
Ben Steffensmeier
4fa2a21323 Issue #1869 Switch acars back to original plot resource. 
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: 5a8118b5a8 [formerly 51015cd592] [formerly 1a1592ea3d [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 4a8a5b16af
 2013-05-15 18:22:25 -05:00
Richard Peter
671aaba9d9 Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development 
Former-commit-id: 9a8bc5871f [formerly fc5b621973] [formerly a073bf2702 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]
Former-commit-id: a073bf2702
Former-commit-id: 57698cc95b
 2013-05-15 18:14:00 -05:00
Dustin Johnson
6fa299ecd8 Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development 
Former-commit-id: 28a4f02216 [formerly 8eeb2f4f9c] [formerly d62e51ad7e [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]
Former-commit-id: d62e51ad7e
Former-commit-id: 00e9f3305d
 2013-05-15 17:06:42 -05:00
Dustin Johnson
31fbf71aa2 Issue #2000 Fix broken stuff after Spring 3 upgrade 
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c

Former-commit-id: 695c64a9f4 [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]
Former-commit-id: ef1e80b61f
Former-commit-id: b8d6f54206
 2013-05-15 16:54:40 -05:00
Nate Jensen
8b1298777c Issue #1989 removing dead plugins from repo 
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

Former-commit-id: b7076f6947 [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]
Former-commit-id: 662fac5b31
Former-commit-id: ae5df55dba
 2013-05-15 16:25:23 -05:00
Richard Peter
a504d84327 Merge "Issue #1989 removing unused jars" into development 
Former-commit-id: 3e1fe851e4 [formerly 303267be4d] [formerly ad43b7bab5 [formerly 544b8830ec6c95ff88726b1095662fac5438cfcb]]
Former-commit-id: ad43b7bab5
Former-commit-id: fb1197ecb7
 2013-05-15 16:17:57 -05:00