Richard Peter
|
0bcf000a31
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]]
Former-commit-id: 93c776022a
Former-commit-id: aec254aac0 [formerly c97efbf656] [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02]]
Former-commit-id: 8eb1848d92c6225ecf7e4aff08b65f9f7fc71abe [formerly 910464ea6a]
Former-commit-id: 94e0faa6c6
|
2013-11-07 14:25:45 -06:00 |
|
Steve Harris
|
0a1446c0ca
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 47778131b0 [formerly b93c4d7cd0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]]]
Former-commit-id: 47778131b0
Former-commit-id: c221d78097 [formerly 687b0848ee] [formerly 73554f8c6995705d78460251d3f25f87c8a32fbf [formerly 079a007217]]
Former-commit-id: d7860f8347a6475cb19459768957483d014d7ac4 [formerly bf0d783e52]
Former-commit-id: 0b0c0e247b
|
2013-11-07 11:32:42 -06:00 |
|
Steve Harris
|
f1688d58e6
|
13.5.3-5 baseline
Former-commit-id: 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly f175680b89 [formerly 06b5e0e0ec [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]]]
Former-commit-id: f175680b89
Former-commit-id: 3fac0e0b27 [formerly d9efe087e5] [formerly cae6925bd9b5a490e72c32e60a0c8c7f114e2386 [formerly 31b57882cb]]
Former-commit-id: 2004c192e88b30c3491b310a59ba776377cf312a [formerly b816e9e555]
Former-commit-id: e8e1307ee0
|
2013-11-07 12:22:32 -05:00 |
|
Steve Harris
|
fad7156490
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 8972badf50 [formerly cdb514cb5c] [formerly c218866826] [formerly 8972badf50 [formerly cdb514cb5c] [formerly c218866826] [formerly d8afc4c58c [formerly c218866826 [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]]]
Former-commit-id: d8afc4c58c
Former-commit-id: 4add6dde39 [formerly a48b85a0b2] [formerly b07c466ba916dfa6be08058979658327eff3043c [formerly 7c71117a50]]
Former-commit-id: a251279b282347c226fb984df9e3f0a69db59c10 [formerly ff548f8557]
Former-commit-id: 878d57675c
|
2013-11-06 13:22:12 -06:00 |
|
Steve Harris
|
2608595d90
|
14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6 [formerly b694612fe0] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed]
Former-commit-id: cfb3194426
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
24ec3c5993
|
14.1.1-6 baseline
Former-commit-id: f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]]
Former-commit-id: 6067af4252
Former-commit-id: 2a5f4c26d6 [formerly e86a0aa489] [formerly 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793]]
Former-commit-id: 30c24036c09dc21bf6f32deefe9a7a44f35d8005 [formerly 270c5f1a2d]
Former-commit-id: 0aa90a7855
|
2013-11-06 14:08:33 -05:00 |
|
Bryan Kowal
|
19a648092a
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh
Former-commit-id: 7f9f20c8a8 [formerly d73aaf9753] [formerly 4bad21e6cd] [formerly 7f9f20c8a8 [formerly d73aaf9753] [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4bad21e6cd [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]]
Former-commit-id: 3255bf3861
Former-commit-id: b85c53c8b0 [formerly 400b4a1328] [formerly fda65eb7f8713472578cb95e718895ab10e4b197 [formerly 76726372e5]]
Former-commit-id: 5afe499eab30a20cc0a548514e8ce73b292bc5ca [formerly 748ab480fb]
Former-commit-id: 2c31c6f4ab
|
2013-11-05 19:03:22 -06:00 |
|
Greg Armendariz
|
2a365a1c76
|
Issue #2520 - Update rpm query calls
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024
Former-commit-id: 4bce15db12 [formerly 67ae7d2244] [formerly 62324b5194] [formerly 4bce15db12 [formerly 67ae7d2244] [formerly 62324b5194] [formerly b078f57dc7 [formerly 62324b5194 [formerly 95c604d179e14d110e0782a5a911f8b6d5104941]]]]
Former-commit-id: b078f57dc7
Former-commit-id: 403fa63efd [formerly 9959fe56ae] [formerly d4116fc6b4626874796f71816cf22b488b6628df [formerly f125f963b3]]
Former-commit-id: feb4196537e2e11c66da3b64b721548e61419d14 [formerly 2c581c0c73]
Former-commit-id: bb2f387371
|
2013-11-05 13:30:01 -06:00 |
|
Steve Harris
|
cff24d592c
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 0dd6732b0e [formerly 569ecb35d5] [formerly 3c862170db] [formerly 0dd6732b0e [formerly 569ecb35d5] [formerly 3c862170db] [formerly 18609de83d [formerly 3c862170db [formerly dbbf326f4fbfb3e07c97f6a7c380fa7e37544b72]]]]
Former-commit-id: 18609de83d
Former-commit-id: 29b6991e03 [formerly 7031baf4ef] [formerly 5a251bd0f0dbb41c6b3c857dc4057527e0a819bf [formerly 5f71d7795f]]
Former-commit-id: 13224d49fa710bcfabab8089ab1de4312bf209c0 [formerly da5e3ea0a9]
Former-commit-id: 4d1b869ee4
|
2013-11-01 13:23:28 -05:00 |
|
Steve Harris
|
c3ac33582f
|
13.5.3-4 baseline
Former-commit-id: 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly da7d1ce05e [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]]
Former-commit-id: da7d1ce05e
Former-commit-id: a4cc3f0bf6 [formerly 7454b37d59] [formerly 7369078223f22949c985fdf82f677dcb829640f5 [formerly b8d3fd62d0]]
Former-commit-id: 0df02f675ff87a29fb8942ecbcc9ef833301020e [formerly 8f9b121f90]
Former-commit-id: 90f27a16c9
|
2013-11-01 14:20:00 -04:00 |
|
Bryan Kowal
|
6a0ddf11e4
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
a7d9b9fc11
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
nativeLib/files.native/files.native.ecl
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.cots.g2clib/.project
nativeLib/rary.cots.g2clib/g2_unpack3.c
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
Former-commit-id: 2ebed2011f [formerly 4d7a4aefec] [formerly 665911b033] [formerly 2ebed2011f [formerly 4d7a4aefec] [formerly 665911b033] [formerly c76c856340 [formerly 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]]
Former-commit-id: c76c856340
Former-commit-id: f37abe3599 [formerly 7a83214b1c] [formerly a87ff201ab972ea4012700b7f82b08857452a1f6 [formerly 0954490a5a]]
Former-commit-id: da8082dd7ce7ed30ca84ffbe89c5465a9f2b305e [formerly 6e08dc72c0]
Former-commit-id: 731efe0fb6
|
2013-10-31 15:23:08 -05:00 |
|
Steve Harris
|
f07e5b778e
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 855b444073 [formerly 2257eb5ddd [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]]
Former-commit-id: 855b444073
Former-commit-id: 23a1f33d89 [formerly c953a6574d] [formerly 2c8c708ed1c375e99805b56ce3ded641d901d6ca [formerly 83dc6d8e2a]]
Former-commit-id: bee869e597b8fb94bb5d2c695cae5fb58d860aab [formerly 60a5ddc88f]
Former-commit-id: 3f27e1cc23
|
2013-10-31 11:58:04 -05:00 |
|
Steve Harris
|
4d2a15c959
|
13.5.3-3 baseline
Former-commit-id: 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]]]
Former-commit-id: 1503847a4b
Former-commit-id: 3a5911368f [formerly a58b825dde] [formerly e27f6359a046d1d0047ec0fc1c24c9d171c5bf82 [formerly 6b879b2465]]
Former-commit-id: 00b390ce880010abcc3167a5427b564527ba940c [formerly 5be6e21405]
Former-commit-id: ef72863e6f
|
2013-10-31 12:52:07 -04:00 |
|
Bryan Kowal
|
feb28fd07f
|
Re-enable the build of the awips2 rpm.
Former-commit-id: bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly 326144970c [formerly 40e8a94235 [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]]]]
Former-commit-id: 326144970c
Former-commit-id: 8479f5a2a3 [formerly 897b7fbd27] [formerly 1c783532062ff1679c7f78199095439201056d75 [formerly 1c0a469975]]
Former-commit-id: 2e7c59ec7e88a1e173edadefda380988bb11ee5d [formerly 8bd4b5dd9a]
Former-commit-id: abe6b1151f
|
2013-10-30 15:24:01 -05:00 |
|
Greg Armendariz
|
a7d7c6447f
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]]
Former-commit-id: 64dd62005b
Former-commit-id: 83262b6cc4 [formerly 5cf091c499] [formerly 3a7bea98c42e7d77a7480bbc262fa233cb1f6a6b [formerly 4fb0e0bd2f]]
Former-commit-id: cc39f166545faa38560a0e3c8a7dafc13408d077 [formerly eefcbf7dcb]
Former-commit-id: c846280439
|
2013-10-30 14:52:16 -05:00 |
|
Steve Harris
|
071a47944f
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 0ab03f2796 [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]]
Former-commit-id: 83d2194a5a
Former-commit-id: eff76c3566 [formerly 771be074c0] [formerly f7cdd9e73c5d19a1d50e670a5eeceaa5bc626e90 [formerly 0efff318b8]]
Former-commit-id: a4fea6a1d532840bbb0cc77ad3e807e6be10e9b3 [formerly f5fc091e48]
Former-commit-id: 6da47cfbdd
|
2013-10-30 12:36:53 -05:00 |
|
Steve Harris
|
e979d6caa1
|
13.5.3-2 baseline
Former-commit-id: 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]]
Former-commit-id: 6d85d944a6
Former-commit-id: fef629ce26 [formerly 0c17777164] [formerly 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2]]
Former-commit-id: 33aa78b83a8657172de9ca0d0ef491a27006efe6 [formerly 1cc13c9992]
Former-commit-id: e90722d781
|
2013-10-30 12:53:25 -04:00 |
|
Bryan Kowal
|
eb907d00da
|
Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: d2bd276fee [formerly e4e2c8c796] [formerly eb4c27003f] [formerly d2bd276fee [formerly e4e2c8c796] [formerly eb4c27003f] [formerly b082ea89c5 [formerly eb4c27003f [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]]]
Former-commit-id: b082ea89c5
Former-commit-id: 2a36503bf0 [formerly 63324cda6a] [formerly 67b06516357f8371d7d025ab695b2a9be1b02fc1 [formerly 428dd993d9]]
Former-commit-id: 7f604c9d9dbf2ed9afef8c5efbddff94468a14f2 [formerly 4789797de5]
Former-commit-id: dbe9ed1433
|
2013-10-30 09:23:55 -05:00 |
|
Bryan Kowal
|
9d0f21ad44
|
Issue #2268 - fix CAVE installation error
Former-commit-id: 6cc545e8b6 [formerly 203c5d7288] [formerly 7772aca092] [formerly 6cc545e8b6 [formerly 203c5d7288] [formerly 7772aca092] [formerly 5bc115c56c [formerly 7772aca092 [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]]]]
Former-commit-id: 5bc115c56c
Former-commit-id: 2c3b6c622d [formerly a89499f399] [formerly 43a2360244f03c9fa2d4d4bd82907faa7bb9c7f2 [formerly a34d7b254f]]
Former-commit-id: 82c464eb9285b8e1ee9cf196e42de986b7c808a5 [formerly 893a2cf334]
Former-commit-id: fba7e48970
|
2013-10-29 11:44:48 -05:00 |
|
Steve Harris
|
179be1638a
|
Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]]
Former-commit-id: 972339d60f
Former-commit-id: dd533f0bce [formerly a444c93ee7] [formerly 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8]]
Former-commit-id: 9ec4de5036bebda97665c7c5c43fd0794ee9593d [formerly 0bf9020c49]
Former-commit-id: f49a22bae2
|
2013-10-28 14:39:22 -05:00 |
|
Steve Harris
|
6b1df92d87
|
14.1.1-5 baseline
Former-commit-id: 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly f4c53b02fa [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]]
Former-commit-id: f4c53b02fa
Former-commit-id: 7de3535d64 [formerly 3b738baba8] [formerly ba0194dff6dd3d0a89190211a15a136f32ca0270 [formerly af2707389c]]
Former-commit-id: 900d27f61f6ae40659280476bc184bfecf0849a7 [formerly 92851705fc]
Former-commit-id: 09eee9a31a
|
2013-10-28 12:14:27 -04:00 |
|
Steve Harris
|
cbf859daf6
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
c784003711
|
14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
|
2013-10-28 10:46:02 -04:00 |
|
Steve Harris
|
719dfc4763
|
13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2fbc08d837 [formerly 06f5dcf801] [formerly 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]]
Former-commit-id: be609d4b1adcd5effdcbb5631255d6839db62e54 [formerly 43610e510c]
Former-commit-id: 0e99e713e6
|
2013-10-28 10:30:57 -04:00 |
|
Steve Harris
|
fc9955c2e0
|
Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
Former-commit-id: 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 426b0662dc [formerly 6aab62b7b9] [formerly 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572]]
Former-commit-id: d8a3fc1a40537d39f3e081ace8795d06803bc0f7 [formerly 3a2a83bc4b]
Former-commit-id: 2864f20285
|
2013-10-25 10:51:42 -05:00 |
|
Steve Harris
|
e0d7e4cc22
|
13.5.2-13 baseline
Former-commit-id: e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]]
Former-commit-id: e7b1702032
Former-commit-id: a2442a8e39 [formerly 96c50ba394] [formerly 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b]]
Former-commit-id: 1340f052e588a7cd26a7455f448e5f92f5304a57 [formerly 6bff2d159f]
Former-commit-id: c71631dd28
|
2013-10-25 10:06:56 -04:00 |
|
Steve Harris
|
d1c823fe65
|
13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 2e6e031198 [formerly 15d9848170] [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]]
Former-commit-id: d6cb813e26904b36ed5b21ea7664539b21d552fa [formerly 248e79aa2f]
Former-commit-id: f97c128cc8
|
2013-10-25 09:59:15 -04:00 |
|
Steve Harris
|
4cfed2d3dd
|
13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]]
Former-commit-id: cbfde2f52a
Former-commit-id: a18eb8fe83 [formerly ecad06c80d] [formerly 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]]
Former-commit-id: b061ebe0205bf516b503d42df7cfdb9aacce9a06 [formerly 49b1168f5e]
Former-commit-id: d63a07d248
|
2013-10-25 09:45:58 -04:00 |
|
Bryan Kowal
|
57da7e4a76
|
Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: a564f382da [formerly 2ad7db4f5d] [formerly b7b11dc747] [formerly a564f382da [formerly 2ad7db4f5d] [formerly b7b11dc747] [formerly 9a472e1bbe [formerly b7b11dc747 [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]]]
Former-commit-id: 9a472e1bbe
Former-commit-id: d6ea68d9c5 [formerly b1bdf0dbc5] [formerly 8d9c6dc200980dd6606b3b3826f070666ae2fefa [formerly f892849313]]
Former-commit-id: 717b0e4321c98c5d3d3288436344edb96c5d1300 [formerly 83c0c7e365]
Former-commit-id: 15cb18c19f
|
2013-10-16 12:54:58 -05:00 |
|
Bryan Kowal
|
fc1ac25dd2
|
Issue #2297 - fix 14.2.1 CAVE build.
Former-commit-id: 8514f712fe [formerly 476c19464d] [formerly 8b3f402dd8] [formerly 8514f712fe [formerly 476c19464d] [formerly 8b3f402dd8] [formerly de09a30a4d [formerly 8b3f402dd8 [formerly d71631f5cabae72a1ceb30f36ce574b2559c235d]]]]
Former-commit-id: de09a30a4d
Former-commit-id: 534db16695 [formerly b8d164bb71] [formerly 8ab460e815a19bf685445346eb309cab37331493 [formerly 3eeefe9e56]]
Former-commit-id: b111380874f008f7cb0bdfbcb45e874f1d6920d3 [formerly c7a890d8c2]
Former-commit-id: ab3041ff05
|
2013-10-15 16:07:23 -05:00 |
|
Bryan Kowal
|
08fcd810c5
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 49dd7daf05 [formerly 3f4263fa07] [formerly a929dec887] [formerly 49dd7daf05 [formerly 3f4263fa07] [formerly a929dec887] [formerly c13018301e [formerly a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]]]
Former-commit-id: c13018301e
Former-commit-id: 07b0c95cb8 [formerly f731c424bb] [formerly 01f5de1dacc767ea28030a4861c52d252dbd57ba [formerly 0a06af1fdd]]
Former-commit-id: b86c85fd3da49ecc68392ee5a3b1ab792326e1f0 [formerly c846630ac7]
Former-commit-id: 5a8bfe3756
|
2013-10-14 17:58:22 -05:00 |
|
Greg Armendariz
|
002280d759
|
Merge "Issue #2297 - fix 14.2.1 qpid build" into development
Former-commit-id: b379f7d077 [formerly 14d90768e0] [formerly aa0d3bdab4] [formerly b379f7d077 [formerly 14d90768e0] [formerly aa0d3bdab4] [formerly 01a1ada89b [formerly aa0d3bdab4 [formerly 6a11a118261a0cbad93933d99d6a89187c831a02]]]]
Former-commit-id: 01a1ada89b
Former-commit-id: dd365e604a [formerly f53973e153] [formerly 5a79b44b0bb7fd3c3b1aa9bf3c9a3731094ee598 [formerly 0d066c50cd]]
Former-commit-id: 921d07ddc3f9a62d9b7b8a9915a9bfc9cf84bc31 [formerly 0d62d1886c]
Former-commit-id: 57728ed486
|
2013-10-14 09:08:05 -05:00 |
|
Bryan Kowal
|
7c4db7372b
|
Issue #2402 - re-compile 32-bit grib2.so
Former-commit-id: 9f5cbcda14 [formerly 410b9b6669] [formerly 05954f89b8] [formerly 9f5cbcda14 [formerly 410b9b6669] [formerly 05954f89b8] [formerly 3eee9edb58 [formerly 05954f89b8 [formerly e70561d259082645390f95df823ad4583aea8bbe]]]]
Former-commit-id: 3eee9edb58
Former-commit-id: ccf1f7845b [formerly c79a66452b] [formerly d95dd19e8bd4fae3a668ab9aa814a42776b4fcb3 [formerly c7381d7ce2]]
Former-commit-id: 1430f0545832022ae3f02294f9969bd5fd850e24 [formerly 8553bbc350]
Former-commit-id: a0c583ceb6
|
2013-10-10 12:49:49 -05:00 |
|
Bryan Kowal
|
c2e386481e
|
Issue #2297 - fix 14.2.1 qpid build
Former-commit-id: 886e5f2370 [formerly a8dfd1ef01] [formerly 9d7ad6908a] [formerly 886e5f2370 [formerly a8dfd1ef01] [formerly 9d7ad6908a] [formerly 584d8b2ae4 [formerly 9d7ad6908a [formerly 7863a68ae1c67188450ab7c3a9cc2c912533300c]]]]
Former-commit-id: 584d8b2ae4
Former-commit-id: ef3865e22a [formerly a4ea738a10] [formerly 032a9246c93b9f11150b7297e5f79e85cb21b868 [formerly be0d60134b]]
Former-commit-id: b596fd1dd4328f92bd0ae05d1d32c6eb932e52b0 [formerly e12cae21f4]
Former-commit-id: f452978591
|
2013-10-10 11:21:11 -05:00 |
|
Bryan Kowal
|
05afd001e1
|
Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: 92aedd9726 [formerly 585f63e88c] [formerly 9c3c123631] [formerly 92aedd9726 [formerly 585f63e88c] [formerly 9c3c123631] [formerly bb9b1e4279 [formerly 9c3c123631 [formerly ae2923791512c7488805c19a773390ef1de5150b]]]]
Former-commit-id: bb9b1e4279
Former-commit-id: 33579d76bf [formerly 80127ae62d] [formerly a05268ac0d403ee40d63b8f5718b2a93c8376d28 [formerly 9d57206173]]
Former-commit-id: f13ab25bb4f3e6990903b1045f95b649bbfa5a51 [formerly 49c19e4bb6]
Former-commit-id: 53a110866d
|
2013-10-09 18:38:58 -05:00 |
|
Bryan Kowal
|
53e3ff55bc
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 740c53e49e [formerly 82559064ef] [formerly 37d1dd492b] [formerly 740c53e49e [formerly 82559064ef] [formerly 37d1dd492b] [formerly 2b26c4c242 [formerly 37d1dd492b [formerly 2e6b76af19b308392e90dfee4c950200ec5c2560]]]]
Former-commit-id: 2b26c4c242
Former-commit-id: 0b923f47dd [formerly 68434c23ef] [formerly 15d79cf54ce977ffbd4be67b9b37cb4278fb7560 [formerly daeb4b7ecb]]
Former-commit-id: a3c2ac0f6a104964578e34f2d4ffac6825b76165 [formerly f31f6ea11d]
Former-commit-id: d65db49046
|
2013-10-09 17:07:10 -05:00 |
|
Richard Peter
|
db521b7fff
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
rpms/awips2.cave/Installer.cave-feature/component.spec
Former-commit-id: ca61898cb4 [formerly 62b322c18d] [formerly 1a664aed21] [formerly ca61898cb4 [formerly 62b322c18d] [formerly 1a664aed21] [formerly c0643db0ba [formerly 1a664aed21 [formerly fee86c220c12c09c714245fa8666bc08f4f9775b]]]]
Former-commit-id: c0643db0ba
Former-commit-id: 57c11e762e [formerly 1c74c3cbde] [formerly 015b66f07af3e9d194a45a1c6b1ca9257fb5ff94 [formerly ecba2f7317]]
Former-commit-id: a98f9803d8b17634f3ea5bdd6a61850aaef01d2a [formerly 93c2c93969]
Former-commit-id: bb0bd3fe2c
|
2013-10-09 13:14:06 -05:00 |
|
Ben Steffensmeier
|
f8fc4887db
|
Issue #2402 Modify grib decoder to work on file extents.
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9
Former-commit-id: d9f383217f [formerly c896c9bf30] [formerly 7d2b48de48] [formerly d9f383217f [formerly c896c9bf30] [formerly 7d2b48de48] [formerly 2b089b0848 [formerly 7d2b48de48 [formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]]]]
Former-commit-id: 2b089b0848
Former-commit-id: ac95afdc52 [formerly 7c6a89b623] [formerly 0d5227b724cd17eaba30e60c17888c90e0ec5d1f [formerly 633a075052]]
Former-commit-id: c5be325dbe4d5bca7afde6dd2069d2369529c96e [formerly 839c602669]
Former-commit-id: 870631902b
|
2013-10-09 12:50:02 -05:00 |
|
Bryan Kowal
|
d6d7b8d2ac
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly 542f5f2349 [formerly aa4ea792c1 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]]
Former-commit-id: 542f5f2349
Former-commit-id: 3534686eb5 [formerly de61382dc7] [formerly 518cc2598c60d171ae83c427ee2062c4d7ef8025 [formerly 5d5ccb7599]]
Former-commit-id: 0c291efdbf84e5f8baf1abb4fbbc4e083a99112e [formerly 86f7af5968]
Former-commit-id: 93dbbc2321
|
2013-10-08 14:44:38 -05:00 |
|
Richard Peter
|
3f75f1804e
|
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]]
Former-commit-id: b6395cc834
Former-commit-id: 873d2bf184 [formerly 0e7dccd18f] [formerly 2c457acf95f4418fe275e09d6d24693aa278fc9b [formerly 3abe952ca0]]
Former-commit-id: f0f8ac95083f4a299eb6e6aa1073debeb4a2953a [formerly 1895c9f914]
Former-commit-id: bc32641181
|
2013-10-08 10:59:50 -05:00 |
|
Bryan Kowal
|
537228e934
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 80c2ccd547 [formerly 96c800f3f4] [formerly 5eba3290c8] [formerly 80c2ccd547 [formerly 96c800f3f4] [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly 5eba3290c8 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]]
Former-commit-id: 8f14318bc7
Former-commit-id: ef0e6ede56 [formerly 72ed6c5f7a] [formerly d3917f8d40a980b637b27fc44df2b93eff0d5796 [formerly 53af4c7284]]
Former-commit-id: 7f36b6b414d057a6775afb670b148d983edab252 [formerly 5477a06781]
Former-commit-id: b8c2ece19c
|
2013-10-08 10:35:03 -05:00 |
|
Richard Peter
|
3f32cc7a8b
|
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]]
Former-commit-id: d9eae3ea28
Former-commit-id: af9c4be87a [formerly 94d0913bd9] [formerly ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]]
Former-commit-id: 4e8e2fc0d4cdef4da801ac692b1793e0b0aadafc [formerly 33b4f0c247]
Former-commit-id: d321c61259
|
2013-10-08 09:45:27 -05:00 |
|
Bryan Kowal
|
74607bfac3
|
Issue #2033 - deploy the CAVE localization to the etc directory at installation time
Change-Id: I899b89c12d2bbe2fb739ba15b3bafbc9855e6102
Former-commit-id: b64ff3e5b0 [formerly 5f72ab9b4e] [formerly 73ccd8245d] [formerly b64ff3e5b0 [formerly 5f72ab9b4e] [formerly 73ccd8245d] [formerly c3a65f9882 [formerly 73ccd8245d [formerly 40d1633bb60c1d9aefcc79022158a66b50cca054]]]]
Former-commit-id: c3a65f9882
Former-commit-id: 6d41496563 [formerly 0f9d525ac1] [formerly 6318bd34a70adec7bacce93dbc889b1c6350df7e [formerly e27bfa7c27]]
Former-commit-id: 9b503867b3bc3cb0c68df17ca895e1a78b627a49 [formerly 2f2c57b448]
Former-commit-id: f7c5884c21
|
2013-10-07 12:22:50 -05:00 |
|
Steve Harris
|
90889f8aa3
|
13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96 [formerly 21b84f0290] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7]
Former-commit-id: e1f7463a41
|
2013-10-04 11:30:03 -04:00 |
|
Bryan Kowal
|
0675463123
|
Revert "Issue #2033 - pde and rpm build updates"
Undo copying localization into etc at build time.
This reverts commit 2cda5c37636a512f1a9ef3de04b0dac3ca31e120 [formerly 9a77e3553a] [formerly b344543d81 [formerly 33a9270304] [formerly 6023c61bca] [formerly b344543d81 [formerly 33a9270304] [formerly 6023c61bca] [formerly 9a77e3553a [formerly 6023c61bca [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]]].
Former-commit-id: ab100bb5b1 [formerly a75ed2b079] [formerly bb2e914c00] [formerly ab100bb5b1 [formerly a75ed2b079] [formerly bb2e914c00] [formerly 9d47e7565d [formerly bb2e914c00 [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]]
Former-commit-id: 9d47e7565d
Former-commit-id: 020566233e [formerly d4eba48f94] [formerly 4664dae5d08c4cc7ae160de4020c49d55f3b6503 [formerly 4d08d7a1c3]]
Former-commit-id: 68d2284d937f5ab15bf63a3e4489f789f257de56 [formerly 2f6791dc19]
Former-commit-id: 07a882ac48
|
2013-10-04 09:47:59 -05:00 |
|
Steve Harris
|
91a0ae5f6d
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.java/1.6/component.spec
Former-commit-id: 1afefb5f6f [formerly 96f30b4793] [formerly 8622cc6efa] [formerly 1afefb5f6f [formerly 96f30b4793] [formerly 8622cc6efa] [formerly df206f83bb [formerly 8622cc6efa [formerly d1246136b73673acd22df53fee02adbd51022b4b]]]]
Former-commit-id: df206f83bb
Former-commit-id: d7cd8984aa [formerly 00cc9bc926] [formerly c0033d06ec93f101a6cee850c2f667d20f652759 [formerly 05ac206277]]
Former-commit-id: fe1cc7d1c0c024538e7a6418610255a065df51cb [formerly b225dffea0]
Former-commit-id: a9d0caa9d7
|
2013-10-03 16:04:21 -05:00 |
|
Bryan Kowal
|
58c68ad717
|
Issue #2423 - Java 7 Revision 40 for Linux
Former-commit-id: aca0ce04b8 [formerly ef93741056] [formerly 3b1f089cbd] [formerly aca0ce04b8 [formerly ef93741056] [formerly 3b1f089cbd] [formerly 26f787ac83 [formerly 3b1f089cbd [formerly 665399b4e10d7d001edc2533b29324da48b78aa9]]]]
Former-commit-id: 26f787ac83
Former-commit-id: 42298eb650 [formerly 2e9836e506] [formerly 9ca71543985cf366b72245955e1fe6c6e51848a9 [formerly 429c534da0]]
Former-commit-id: 711ed72151263981fca589f1d61416eda2f74eea [formerly 9f7222a1b3]
Former-commit-id: 16efd625bb
|
2013-10-03 11:54:23 -05:00 |
|
Bryan Kowal
|
ea88581637
|
Issue #2432 - fix qpid build
Former-commit-id: 20cf44791d [formerly fdf31a8a6e] [formerly 5db663c2ae] [formerly 20cf44791d [formerly fdf31a8a6e] [formerly 5db663c2ae] [formerly 6736231873 [formerly 5db663c2ae [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]]]
Former-commit-id: 6736231873
Former-commit-id: 51cf9ed479 [formerly bd93d164c7] [formerly f0d8690b42b34a08e3cc25f03f917bd6fd863575 [formerly f100a9c96a]]
Former-commit-id: 27430e9ec9200cfdcd7eee31ec3a7954ca40324c [formerly 751cd48248]
Former-commit-id: e874f182ef
|
2013-10-03 08:33:15 -05:00 |
|
Bryan Kowal
|
ef1e7311a0
|
Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: f092ee3d76 [formerly efd377f12f] [formerly 61527c0b80] [formerly f092ee3d76 [formerly efd377f12f] [formerly 61527c0b80] [formerly 87087a5ea4 [formerly 61527c0b80 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]]
Former-commit-id: 87087a5ea4
Former-commit-id: c5df92f4eb [formerly af4b729522] [formerly b91956819bff7666a317ceb10eb717ae268cbcff [formerly fe4e9ca3f8]]
Former-commit-id: 67768811b42e628c1bd76006584ee4a3345d538e [formerly 297ee050ca]
Former-commit-id: a249b45111
|
2013-10-02 18:41:11 -05:00 |
|