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

313 commits

Author SHA1 Message Date
Richard Peter
fbc9ab7df1 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: 14d5b8656e [formerly f69bbf7952 [formerly cb33f5ada7] [formerly 14d5b8656e [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]
Former-commit-id: f69bbf7952 [formerly cb33f5ada7]
Former-commit-id: f69bbf7952
Former-commit-id: 9b5d2fa69f
 2013-10-23 15:50:25 -05:00
Richard Peter
40a670bab5 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: fbc9ab7df1 [formerly 9b5d2fa69f] [formerly f69bbf7952] [formerly f69bbf7952 [formerly cb33f5ada7]] [formerly fbc9ab7df1 [formerly 9b5d2fa69f] [formerly f69bbf7952] [formerly f69bbf7952 [formerly cb33f5ada7]] [formerly 14d5b8656e [formerly f69bbf7952 [formerly cb33f5ada7] [formerly 14d5b8656e [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]]]
Former-commit-id: 14d5b8656e
Former-commit-id: d1dda0d18e [formerly b29e037e05] [formerly a49c67203e] [formerly 7f3ac8437c52f86ad4ef4bc45fc02522210f6148 [formerly e43a9bab4c68a481f2c9959d56447b4b556d21ba] [formerly a49c67203e [formerly 6ecb80e892]]]
Former-commit-id: e3da18e35445d090ecf1d42772ba24617818fe1d [formerly eeadb56d97d16e80b358cd1042a03be4d25aa4bb] [formerly 9b381e593d [formerly e27a298e62]]
Former-commit-id: b4b700b45093f85dc45f53c2c259253f898053f4 [formerly 9b381e593d]
Former-commit-id: 0a7c1f2fd7
 2013-10-23 15:50:25 -05:00
Nate Jensen
b56c67a8fb Issue #2359 better email addresses 
Former-commit-id: 03be0960bfbbd8072166bc0a06e4100538dbc7ca
 2013-10-23 14:02:31 -05:00
Nate Jensen
95c2ab17ca Issue #2359 better email addresses 
Former-commit-id: b56c67a8fb [formerly fd55a9792d [formerly a609706b5e] [formerly b56c67a8fb [formerly 03be0960bfbbd8072166bc0a06e4100538dbc7ca]]]
Former-commit-id: fd55a9792d [formerly a609706b5e]
Former-commit-id: fd55a9792d
Former-commit-id: 55fd890223
 2013-10-23 14:02:31 -05:00
Nate Jensen
7506826c07 Issue #2359 better email addresses 
Former-commit-id: 95c2ab17ca [formerly 55fd890223] [formerly fd55a9792d] [formerly fd55a9792d [formerly a609706b5e]] [formerly 95c2ab17ca [formerly 55fd890223] [formerly fd55a9792d] [formerly fd55a9792d [formerly a609706b5e]] [formerly b56c67a8fb [formerly fd55a9792d [formerly a609706b5e] [formerly b56c67a8fb [formerly 03be0960bfbbd8072166bc0a06e4100538dbc7ca]]]]]
Former-commit-id: b56c67a8fb
Former-commit-id: b310a9b099 [formerly 60421b1896] [formerly e56a3b633d] [formerly 87e35914b7d75bb5fa95f246430220d187e91bfa [formerly 2293b6b5e3573279b7874a10055d6a27b5e5eb3a] [formerly e56a3b633d [formerly cf4f6c3d4b]]]
Former-commit-id: 01a93a45b589dea38095260a82964cfcd5e61ae2 [formerly 6c6283d43385bc53c04932cc857731c743617f10] [formerly 4b379c871a [formerly e36fef6dba]]
Former-commit-id: 4b379c871a
Former-commit-id: 6e06e2852f
 2013-10-23 14:02:31 -05:00
Steve Harris
18325949fb 13.5.2-8 baseline 
Former-commit-id: 6effdd3f5ce46910c89236306fa33499eada174f
 2013-10-04 11:30:03 -04:00
Steve Harris
8b2f1998d2 13.5.2-8 baseline 
Former-commit-id: 18325949fb [formerly 8ba7d392d6 [formerly 94aa71fcd1] [formerly 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 8ba7d392d6 [formerly 94aa71fcd1]
Former-commit-id: 8ba7d392d6
Former-commit-id: 553238dca4
 2013-10-04 11:30:03 -04:00
Steve Harris
384aa44093 13.5.2-8 baseline 
Former-commit-id: 8b2f1998d2 [formerly 553238dca4] [formerly 8ba7d392d6] [formerly 8ba7d392d6 [formerly 94aa71fcd1]] [formerly 8b2f1998d2 [formerly 553238dca4] [formerly 8ba7d392d6] [formerly 8ba7d392d6 [formerly 94aa71fcd1]] [formerly 18325949fb [formerly 8ba7d392d6 [formerly 94aa71fcd1] [formerly 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]]
Former-commit-id: 18325949fb
Former-commit-id: 37f0ef6aec [formerly 9e5ad5cd96] [formerly 21b84f0290] [formerly b75f5afe77740032a424b16fe098a67382476c49 [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06] [formerly 21b84f0290 [formerly d89fbf73d9]]]
Former-commit-id: 0b432fa429322b9878fa3f187ef1c0b68a9fdbf6 [formerly eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac] [formerly e1f7463a41 [formerly 088eb89ca7]]
Former-commit-id: e1f7463a41
Former-commit-id: 90889f8aa3
 2013-10-04 11:30:03 -04:00
Bryan Kowal
9829477ced Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6 
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 97612cb78e067c493f7b5a76a2a84d88c96a5094
 2013-09-30 18:00:31 -05:00
Bryan Kowal
b99a401727 Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6 
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 9829477ced [formerly bb5acf7c11 [formerly c125b5b053] [formerly 9829477ced [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]
Former-commit-id: bb5acf7c11 [formerly c125b5b053]
Former-commit-id: bb5acf7c11
Former-commit-id: 3b7573154c
 2013-09-30 18:00:31 -05:00
Bryan Kowal
b5fb5b67c6 Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6 
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: b99a401727 [formerly 3b7573154c] [formerly bb5acf7c11] [formerly bb5acf7c11 [formerly c125b5b053]] [formerly b99a401727 [formerly 3b7573154c] [formerly bb5acf7c11] [formerly bb5acf7c11 [formerly c125b5b053]] [formerly 9829477ced [formerly bb5acf7c11 [formerly c125b5b053] [formerly 9829477ced [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]]
Former-commit-id: 9829477ced
Former-commit-id: ddcedcc8b2 [formerly f7009e8d15] [formerly 0f825df590] [formerly 95de9d8a9cfbec1d7ebfcc89524eb4fb01618014 [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730] [formerly 0f825df590 [formerly ef789bf912]]]
Former-commit-id: fdd5e2f8f1cac089e2bef02f2c77078adb3b13dc [formerly 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531] [formerly 7bd9ea3d30 [formerly 0efd4c7c50]]
Former-commit-id: 7bd9ea3d30
Former-commit-id: 87750ddaef
 2013-09-30 18:00:31 -05:00
Nate Jensen
f148663bd1 Issue #2359 initial checkin of remote log service 
Change-Id: Idd48062f204002956f63c6d449868a7bd9695263

Former-commit-id: 12988c63aeccc678f25f4210ad484a080ddd8aa7
 2013-09-12 11:50:16 -05:00
Nate Jensen
87a6fc1aa8 Issue #2359 initial checkin of remote log service 
Change-Id: Idd48062f204002956f63c6d449868a7bd9695263

Former-commit-id: f148663bd1 [formerly 74c1e60ad2 [formerly 3162ae260b] [formerly f148663bd1 [formerly 12988c63aeccc678f25f4210ad484a080ddd8aa7]]]
Former-commit-id: 74c1e60ad2 [formerly 3162ae260b]
Former-commit-id: 74c1e60ad2
Former-commit-id: 1c344d7f6d
 2013-09-12 11:50:16 -05:00
Nate Jensen
eaa629c471 Issue #2359 initial checkin of remote log service 
Change-Id: Idd48062f204002956f63c6d449868a7bd9695263

Former-commit-id: 87a6fc1aa8 [formerly 1c344d7f6d] [formerly 74c1e60ad2] [formerly 74c1e60ad2 [formerly 3162ae260b]] [formerly 87a6fc1aa8 [formerly 1c344d7f6d] [formerly 74c1e60ad2] [formerly 74c1e60ad2 [formerly 3162ae260b]] [formerly f148663bd1 [formerly 74c1e60ad2 [formerly 3162ae260b] [formerly f148663bd1 [formerly 12988c63aeccc678f25f4210ad484a080ddd8aa7]]]]]
Former-commit-id: f148663bd1
Former-commit-id: 28fb4ac3c2 [formerly fa5a09cd4f] [formerly dc369018c3] [formerly 8c8d62f748afc8b12cfde394366b5759102380ab [formerly 66ad50559daae315ed1a243c360ee5c9fa2c6a22] [formerly dc369018c3 [formerly ebf89475c5]]]
Former-commit-id: 6f7ebbad358d9578326696ad368f4c902f2dfe3f [formerly 73e791de93b7d5d0ce8043989c628609bc759596] [formerly ba65c8a3e5 [formerly d70275ed1c]]
Former-commit-id: ba65c8a3e5
Former-commit-id: ed80aaf209
 2013-09-12 11:50:16 -05:00
Bryan Kowal
94eacfc460 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup 
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: 58a80b4b6d31d11b0ca722545bfd788a2feee488
 2013-08-15 15:30:05 -05:00
Bryan Kowal
5c5bcd5313 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup 
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: 94eacfc460 [formerly 683d7e5b19 [formerly c1dab22fdb] [formerly 94eacfc460 [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]
Former-commit-id: 683d7e5b19 [formerly c1dab22fdb]
Former-commit-id: 683d7e5b19
Former-commit-id: fb1feea107
 2013-08-15 15:30:05 -05:00
Bryan Kowal
9e1afffeaf Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup 
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: 5c5bcd5313 [formerly fb1feea107] [formerly 683d7e5b19] [formerly 683d7e5b19 [formerly c1dab22fdb]] [formerly 5c5bcd5313 [formerly fb1feea107] [formerly 683d7e5b19] [formerly 683d7e5b19 [formerly c1dab22fdb]] [formerly 94eacfc460 [formerly 683d7e5b19 [formerly c1dab22fdb] [formerly 94eacfc460 [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]]]
Former-commit-id: 94eacfc460
Former-commit-id: 5df080a51d [formerly 33b6f03899] [formerly 53124c5e02] [formerly e67f068358f19bcd55854e93ec6da6311fa076e3 [formerly b8d6af6f18e6e9e34cf5082362f7b792032c2de6] [formerly 53124c5e02 [formerly 75c6d4ebf6]]]
Former-commit-id: 3fd05b53b4c3da8afd2f26cf401f915a94749eab [formerly e3b28978c51f9031cb777d8427d123b55b738085] [formerly 2e6116a952 [formerly eab659f961]]
Former-commit-id: 2e6116a952
Former-commit-id: cb7e87d9a4
 2013-08-15 15:30:05 -05:00
Steve Harris
dfbf9a5afe 13.5.1-8 baseline 
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
 2013-07-26 09:02:34 -04:00
Steve Harris
974c5fa6c0 13.5.1-8 baseline 
Former-commit-id: dfbf9a5afe [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: 392faf86e7 [formerly 3bece5e5d0]
Former-commit-id: 392faf86e7
Former-commit-id: 52da6c54db
 2013-07-26 09:02:34 -04:00
Steve Harris
2cdc6c2c49 13.5.1-8 baseline 
Former-commit-id: 974c5fa6c0 [formerly 52da6c54db] [formerly 392faf86e7] [formerly 392faf86e7 [formerly 3bece5e5d0]] [formerly 974c5fa6c0 [formerly 52da6c54db] [formerly 392faf86e7] [formerly 392faf86e7 [formerly 3bece5e5d0]] [formerly dfbf9a5afe [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: de1f3ab63c [formerly 340e7bab60] [formerly a7d4c6274e] [formerly ddd2c19f3db66af417c2b1c87440c44858e5b8ed [formerly 045a10d1b22e942768c319f31dc18646c3419092] [formerly a7d4c6274e [formerly 2afb46f814]]]
Former-commit-id: 3589e4802af7525fe8fe578ef6d85da3ab681b40 [formerly 25e673600ebb4cafb2c67928841e30149139a498] [formerly 767b7fdb4d [formerly 1a3197efdf]]
Former-commit-id: 767b7fdb4d
Former-commit-id: dded20dc93
 2013-07-26 09:02:34 -04:00
Everett Kladstrup
9515d45e9d Issue #2231 Make edex startup more configurable 
* Allow for skipping the RPM check
* Allow for using system java in wrapper instead of hard-coded /awips2/java
* Allow for configuring wrapper process actions with system variables
  e.g. RESTART vs. SHUTDOWN on crash

Change-Id: Icaa3b3e388013a8106db6e29fd999aa5824c72bc

Former-commit-id: 7834360e8c56ac74b29a585eeda8c0387067250b
 2013-07-25 12:22:32 -05:00
Everett Kladstrup
e18ed85a17 Issue #2231 Make edex startup more configurable 
* Allow for skipping the RPM check
* Allow for using system java in wrapper instead of hard-coded /awips2/java
* Allow for configuring wrapper process actions with system variables
  e.g. RESTART vs. SHUTDOWN on crash

Change-Id: Icaa3b3e388013a8106db6e29fd999aa5824c72bc

Former-commit-id: 9515d45e9d [formerly 3bb1b03cb7 [formerly e056592ba9] [formerly 9515d45e9d [formerly 7834360e8c56ac74b29a585eeda8c0387067250b]]]
Former-commit-id: 3bb1b03cb7 [formerly e056592ba9]
Former-commit-id: 3bb1b03cb7
Former-commit-id: 2c518b816d
 2013-07-25 12:22:32 -05:00
Everett Kladstrup
9bb28f5898 Issue #2231 Make edex startup more configurable 
* Allow for skipping the RPM check
* Allow for using system java in wrapper instead of hard-coded /awips2/java
* Allow for configuring wrapper process actions with system variables
  e.g. RESTART vs. SHUTDOWN on crash

Change-Id: Icaa3b3e388013a8106db6e29fd999aa5824c72bc

Former-commit-id: e18ed85a17 [formerly 2c518b816d] [formerly 3bb1b03cb7] [formerly 3bb1b03cb7 [formerly e056592ba9]] [formerly e18ed85a17 [formerly 2c518b816d] [formerly 3bb1b03cb7] [formerly 3bb1b03cb7 [formerly e056592ba9]] [formerly 9515d45e9d [formerly 3bb1b03cb7 [formerly e056592ba9] [formerly 9515d45e9d [formerly 7834360e8c56ac74b29a585eeda8c0387067250b]]]]]
Former-commit-id: 9515d45e9d
Former-commit-id: b7fb0553a0 [formerly 5e5504d664] [formerly 37ce990b54] [formerly ea3a280897186924357daafe11cb9b1ce1e21dab [formerly 96047241098de435c61202b2dde98576c53cbe5e] [formerly 37ce990b54 [formerly b9dda179a0]]]
Former-commit-id: 97d57761fe3d0ca511d87dedc0d59fced32cc413 [formerly 9007806deec2984a2810679a8328709844d63980] [formerly 33693f1903 [formerly eec23b6971]]
Former-commit-id: 33693f1903
Former-commit-id: 43814b2bfb
 2013-07-25 12:22:32 -05:00
Richard Peter
c6386e306f Merge branch 'omaha_13.5.1' (13.5.1-7) into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 293586df88f53c2ddf6f7586bf71719298728022
 2013-07-22 09:40:18 -05:00
Richard Peter
36361ae0c8 Merge branch 'omaha_13.5.1' (13.5.1-7) into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: c6386e306f [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: 401ed88e44 [formerly 15d1a6eab0]
Former-commit-id: 401ed88e44
Former-commit-id: 19dacc32c1
 2013-07-22 09:40:18 -05:00
Richard Peter
477c4a841b Merge branch 'omaha_13.5.1' (13.5.1-7) into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 36361ae0c8 [formerly 19dacc32c1] [formerly 401ed88e44] [formerly 401ed88e44 [formerly 15d1a6eab0]] [formerly 36361ae0c8 [formerly 19dacc32c1] [formerly 401ed88e44] [formerly 401ed88e44 [formerly 15d1a6eab0]] [formerly c6386e306f [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]]
Former-commit-id: c6386e306f
Former-commit-id: dd497c8661 [formerly 4c53471f8e] [formerly e7ec068c7e] [formerly ceeb9e903cbfa51936c1e32e3152413eca616a19 [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81] [formerly e7ec068c7e [formerly 12993d9539]]]
Former-commit-id: 695bc3e79dd459353e36b44ad602e0bc8c50d8ab [formerly 468a024f2957450aa44633c7888eb3aad2011b85] [formerly 2a9cfe51af [formerly 85fc9c773b]]
Former-commit-id: 519f5705ca875b71bedfeb00d8cfdc1cd6c3c2ea [formerly 2a9cfe51af]
Former-commit-id: 1d08e54d43
 2013-07-22 09:40:18 -05:00
Richard Peter
cc7189fcb7 Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	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/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7
 2013-07-18 21:46:25 -05:00
Richard Peter
ddd18e41ba Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	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/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: cc7189fcb7 [formerly 85fb4c3940 [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]
Former-commit-id: 85fb4c3940 [formerly 7e08c04383]
Former-commit-id: 85fb4c3940
Former-commit-id: 8e3a28636c
 2013-07-18 21:46:25 -05:00
Richard Peter
c4bc7286d2 Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	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/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: ddd18e41ba [formerly 8e3a28636c] [formerly 85fb4c3940] [formerly 85fb4c3940 [formerly 7e08c04383]] [formerly ddd18e41ba [formerly 8e3a28636c] [formerly 85fb4c3940] [formerly 85fb4c3940 [formerly 7e08c04383]] [formerly cc7189fcb7 [formerly 85fb4c3940 [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: f25d66abb2 [formerly e46425cd8d] [formerly eefaf2c836] [formerly 53a528233fa3fd8ec1bf77e48b84d02e51d7a54a [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7] [formerly eefaf2c836 [formerly ea2b372343]]]
Former-commit-id: 225e73149d92ac45a746e7b476fb29791f837d3d [formerly fcddfd2ee1c278a22544ea6d0efd7a301de67fff] [formerly 374879df01 [formerly 3a573f4256]]
Former-commit-id: 374879df01
Former-commit-id: 69af3f93ca
 2013-07-18 21:46:25 -05:00
Steve Harris
86ce1248c2 13.5.1-7 baseline 
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
 2013-07-18 12:07:22 -04:00
Steve Harris
65139f6e11 13.5.1-7 baseline 
Former-commit-id: 86ce1248c2 [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 630705aa3f [formerly bf58a81b38]
Former-commit-id: 630705aa3f
Former-commit-id: 67299457b1
 2013-07-18 12:07:22 -04:00
Steve Harris
1243f86b8b 13.5.1-7 baseline 
Former-commit-id: 65139f6e11 [formerly 67299457b1] [formerly 630705aa3f] [formerly 630705aa3f [formerly bf58a81b38]] [formerly 65139f6e11 [formerly 67299457b1] [formerly 630705aa3f] [formerly 630705aa3f [formerly bf58a81b38]] [formerly 86ce1248c2 [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 02f16dcf12 [formerly 0fe8173b7b] [formerly cb50a0028d] [formerly 65fa3e98803abf23e4cb0984d4cdc1e423d038b2 [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d] [formerly cb50a0028d [formerly f9c9aecba5]]]
Former-commit-id: d8aae14e735f7c6530021e331eb050b3688129b3 [formerly bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4] [formerly 513c089375 [formerly eff4fb29dd]]
Former-commit-id: 513c089375
Former-commit-id: adf2f89d57
 2013-07-18 12:07:22 -04:00
Bryan Kowal
c3a87eadea Issue #2153 - fix commons-logging dependencies for wes2bridge 
Former-commit-id: 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65
 2013-07-08 20:14:11 -05:00
Bryan Kowal
2852f6b48b Issue #2153 - fix commons-logging dependencies for wes2bridge 
Former-commit-id: c3a87eadea [formerly 8485164fa2 [formerly 650509604a] [formerly c3a87eadea [formerly 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65]]]
Former-commit-id: 8485164fa2 [formerly 650509604a]
Former-commit-id: 8485164fa2
Former-commit-id: a9f9517cfc
 2013-07-08 20:14:11 -05:00
Bryan Kowal
197290c700 Issue #2153 - fix commons-logging dependencies for wes2bridge 
Former-commit-id: 2852f6b48b [formerly a9f9517cfc] [formerly 8485164fa2] [formerly 8485164fa2 [formerly 650509604a]] [formerly 2852f6b48b [formerly a9f9517cfc] [formerly 8485164fa2] [formerly 8485164fa2 [formerly 650509604a]] [formerly c3a87eadea [formerly 8485164fa2 [formerly 650509604a] [formerly c3a87eadea [formerly 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65]]]]]
Former-commit-id: c3a87eadea
Former-commit-id: 7fa0a4560f [formerly a5d925cf35] [formerly bdabcac203] [formerly c2a0f2e34f376c8f8ab223f4baa6e26d0d74325a [formerly 7544cc885821cce005f9f789f2f8be15b1c17560] [formerly bdabcac203 [formerly 2dc96499d0]]]
Former-commit-id: 79d2929ab3047077d7b8be5af8695566783d3fdd [formerly 9d0ccc0282df419cdba68586b88024f8b87a7069] [formerly 259a7d99b1 [formerly b3a93df1df]]
Former-commit-id: 259a7d99b1
Former-commit-id: 66be02b953
 2013-07-08 20:14:11 -05:00
Bryan Kowal
38aa7723c6 Issue #2133 - qpid is now a wrapped java application; incremented qpid release 
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 24c451a8afbd1b406ee7f83997e0ab92f1625b89
 2013-07-03 15:55:53 -05:00
Bryan Kowal
33d042b493 Issue #2133 - qpid is now a wrapped java application; incremented qpid release 
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 38aa7723c6 [formerly 1932480e2b [formerly f6412117e1] [formerly 38aa7723c6 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]
Former-commit-id: 1932480e2b [formerly f6412117e1]
Former-commit-id: 1932480e2b
Former-commit-id: 93e2de5223
 2013-07-03 15:55:53 -05:00
Bryan Kowal
9a0d2071a6 Issue #2133 - qpid is now a wrapped java application; incremented qpid release 
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 33d042b493 [formerly 93e2de5223] [formerly 1932480e2b] [formerly 1932480e2b [formerly f6412117e1]] [formerly 33d042b493 [formerly 93e2de5223] [formerly 1932480e2b] [formerly 1932480e2b [formerly f6412117e1]] [formerly 38aa7723c6 [formerly 1932480e2b [formerly f6412117e1] [formerly 38aa7723c6 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]]]
Former-commit-id: 38aa7723c6
Former-commit-id: e87ee068b0 [formerly 3c0cb232c2] [formerly 56c7afbc0f] [formerly 6562ecf09271ab9a13687241fde561e0a8adc8fc [formerly 2f3b48fdc497c9180ad73d6b0dbc1d60d2ff66f5] [formerly 56c7afbc0f [formerly 32190c8848]]]
Former-commit-id: 261fdfee9fc7b889201c147921e349b6fa4bc69c [formerly 81c0dc9cc92256c552f8824baaacb4018e281a6a] [formerly f56e42195e [formerly 22c2eef5ee]]
Former-commit-id: f56e42195e
Former-commit-id: fc184536e0
 2013-07-03 15:55:53 -05:00
Bryan Kowal
9f632d9e2d Issue #2164 - fix 13.6.1 wes2bridge build 
Former-commit-id: 31b29f11b0e60c0741f69be824093d4f76961eb5
 2013-07-03 15:35:12 -05:00
Bryan Kowal
37d6418064 Issue #2164 - fix 13.6.1 wes2bridge build 
Former-commit-id: 9f632d9e2d [formerly f484a47d43 [formerly 63345a298b] [formerly 9f632d9e2d [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]]
Former-commit-id: f484a47d43 [formerly 63345a298b]
Former-commit-id: f484a47d43
Former-commit-id: c087e22ce2
 2013-07-03 15:35:12 -05:00
Bryan Kowal
9ce4abd3f6 Issue #2164 - fix 13.6.1 wes2bridge build 
Former-commit-id: 37d6418064 [formerly c087e22ce2] [formerly f484a47d43] [formerly f484a47d43 [formerly 63345a298b]] [formerly 37d6418064 [formerly c087e22ce2] [formerly f484a47d43] [formerly f484a47d43 [formerly 63345a298b]] [formerly 9f632d9e2d [formerly f484a47d43 [formerly 63345a298b] [formerly 9f632d9e2d [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]]]]
Former-commit-id: 9f632d9e2d
Former-commit-id: 286d3dcbb5 [formerly 4076dec94a] [formerly 588503289a] [formerly 0694855801df46262710c995461e730478e451d9 [formerly f3b3951a079ee2c3525215ec62394bf5fd3f4f19] [formerly 588503289a [formerly 4a492c0059]]]
Former-commit-id: cd435d1114667e9a154b33b038986088953de9b1 [formerly 2f68c08bc3944257714151fa3149a9fbc42295c8] [formerly 1dff626fef [formerly d262771d1b]]
Former-commit-id: 1dff626fef
Former-commit-id: be2e2452b3
 2013-07-03 15:35:12 -05:00
Steve Harris
e197f23ce3 13.5.1-4 baseline 
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
 2013-06-28 09:46:25 -04:00
Steve Harris
b6c2943382 13.5.1-4 baseline 
Former-commit-id: e197f23ce3 [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: c56be8a332 [formerly 70e4ff30a6]
Former-commit-id: c56be8a332
Former-commit-id: 2487a8b435
 2013-06-28 09:46:25 -04:00
Steve Harris
d5a80e2c41 13.5.1-4 baseline 
Former-commit-id: b6c2943382 [formerly 2487a8b435] [formerly c56be8a332] [formerly c56be8a332 [formerly 70e4ff30a6]] [formerly b6c2943382 [formerly 2487a8b435] [formerly c56be8a332] [formerly c56be8a332 [formerly 70e4ff30a6]] [formerly e197f23ce3 [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 177d322f79 [formerly 43bb696901] [formerly 640b022e84] [formerly 0d0043b60f5590e0023b02b04652467dab80742c [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b] [formerly 640b022e84 [formerly f658320357]]]
Former-commit-id: 1aa572ea00fb2a652a7b3b52d49ed9192cf5c8d5 [formerly 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c] [formerly c05a6c8b50 [formerly c183e08922]]
Former-commit-id: c05a6c8b50
Former-commit-id: 9f5469bc6e
 2013-06-28 09:46:25 -04:00
Steve Harris
fe872355a7 13.5.1-1 baseline 
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
 2013-06-10 15:17:17 -04:00
Steve Harris
2f344da22c 13.5.1-1 baseline 
Former-commit-id: fe872355a7 [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: 6384018950 [formerly 998961612c]
Former-commit-id: 6384018950
Former-commit-id: 5d99df9969
 2013-06-10 15:17:17 -04:00
Steve Harris
98b3f1481d 13.5.1-1 baseline 
Former-commit-id: 2f344da22c [formerly 5d99df9969] [formerly 6384018950] [formerly 6384018950 [formerly 998961612c]] [formerly 2f344da22c [formerly 5d99df9969] [formerly 6384018950] [formerly 6384018950 [formerly 998961612c]] [formerly fe872355a7 [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]]
Former-commit-id: fe872355a7
Former-commit-id: 7da64307e2 [formerly 43b7a9b410] [formerly 0aab285b8a] [formerly cb6ae479723283672da81805b842b8f452f65ad4 [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69] [formerly 0aab285b8a [formerly 30ba1d634e]]]
Former-commit-id: 846a8749d39dba5372665179e09a90710c861d92 [formerly 83a711e54bdd8cabc147e6ca5222939082f46f9c] [formerly 859965fc9d [formerly 146c5e8940]]
Former-commit-id: 859965fc9d
Former-commit-id: 97a4c59662
 2013-06-10 15:17:17 -04:00
Bryan Kowal
3d885c7a60 Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities 
Former-commit-id: 360e0f61f8580cfca1e8dd307e920e9e0150016d
 2013-06-03 11:05:21 -05:00
Bryan Kowal
bd56715410 Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities 
Former-commit-id: 3d885c7a60 [formerly e673c5c553 [formerly c407dd8623] [formerly 3d885c7a60 [formerly 360e0f61f8580cfca1e8dd307e920e9e0150016d]]]
Former-commit-id: e673c5c553 [formerly c407dd8623]
Former-commit-id: e673c5c553
Former-commit-id: 6719473eae
 2013-06-03 11:05:21 -05:00
Bryan Kowal
7d6d000c10 Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities 
Former-commit-id: bd56715410 [formerly 6719473eae] [formerly e673c5c553] [formerly e673c5c553 [formerly c407dd8623]] [formerly bd56715410 [formerly 6719473eae] [formerly e673c5c553] [formerly e673c5c553 [formerly c407dd8623]] [formerly 3d885c7a60 [formerly e673c5c553 [formerly c407dd8623] [formerly 3d885c7a60 [formerly 360e0f61f8580cfca1e8dd307e920e9e0150016d]]]]]
Former-commit-id: 3d885c7a60
Former-commit-id: fa7a446e4f [formerly be8aab95e9] [formerly 5a4726bdc2] [formerly fae8902e3270292079dcaf0f0025e7ab99dc17e1 [formerly 282496ad9a90b4fff81f18018574383b257c142f] [formerly 5a4726bdc2 [formerly 5f637cc57b]]]
Former-commit-id: b069e44c9b807ca1976409879858b4a2e8c350f8 [formerly c13d5340a722273a6de1ef2e18e1ecdb0cadba46] [formerly 7edecdb7dd [formerly 2050dec254]]
Former-commit-id: 94ffe41acb57da281373c89f5d5088bdb51b2df2 [formerly 7edecdb7dd]
Former-commit-id: 466c50ebc4
 2013-06-03 11:05:21 -05:00