mjames-upc
|
a5fb033fa7
|
pyparsing 2.0.1 and six 1.9.0
Former-commit-id: f0d18c7ab3 [formerly 755e8a07fb] [formerly ca15bbcb1ed28f29b85b92d615a85380f76592a1 [formerly b77e15ce03]]
Former-commit-id: 180be5b97744ee2d870096c51fded0039d3f6586 [formerly d4efcc78c3]
Former-commit-id: abc63d2f3e
|
2015-08-06 15:42:35 -06:00 |
|
AWIPS User
|
1f2c7dd237
|
updated numpy, scipy, matplotlib. added cython, metpy, python-dateutil, six, pint.
Former-commit-id: fee97d57cc [formerly 829afc3e85] [formerly fa5e33604b6a832bb5b5d4d082a26d8d68e690ad [formerly 2982d68160]]
Former-commit-id: c2259e888b996bcc79c7e8d23f2752e578886af2 [formerly 28f92948a0]
Former-commit-id: ab36035399
|
2015-08-02 10:31:57 -06:00 |
|
AWIPS User
|
78f6ab7ba1
|
numpy->1.9.2, cython 0.22.1 added for rpm build
Former-commit-id: 811013d84e [formerly f89120af6b] [formerly 421b0e5856091c2f61feae3bc3256c2babd65e16 [formerly 53c4a138c9]]
Former-commit-id: 93a640569c67ea160ec8c819278fded601201964 [formerly e6133124ac]
Former-commit-id: 1746b74950
|
2015-08-01 16:06:25 -06:00 |
|
mjames-upc
|
5043990913
|
build updates for 14.4.1-1n15
Former-commit-id: ddc43fc394 [formerly e263acdd2b] [formerly f5c6815027bce985d786850ccaec18c25176d90c [formerly d0774eea44]]
Former-commit-id: 7d9bfff17fd08f0add7486eaa3e7519a758e645c [formerly 9cce96fffa]
Former-commit-id: ec29d9124e
|
2015-07-09 14:46:43 -06:00 |
|
AWIPS User
|
cebb8b38c8
|
build updates
Former-commit-id: 18aa0e5dc7 [formerly a3cef2f93b] [formerly 3d4cb2094519fd1f7d725ba29867111d886bf589 [formerly 6f457198ce]]
Former-commit-id: d76925435260a8a00d7978ea1c0ee7359793f42c [formerly e9ec10cbc4]
Former-commit-id: 98f56937b5
|
2015-04-24 06:23:59 -06:00 |
|
mjames-upc
|
36d4337756
|
build update, remove leftover plugins or else CAVE build barfs
Former-commit-id: 4a83aa7b8a [formerly 06825dfa09] [formerly cdedc4c022eeafa4e36a1a88d5985a1cacbb0d60 [formerly 9327b7b7bc]]
Former-commit-id: 8ca8ba460a435d5e754a635d31ce96f27203ebfa [formerly 5098e0c346]
Former-commit-id: 973adde1cc
|
2015-04-20 17:29:07 -06:00 |
|
mjames-upc
|
ee3d447aa1
|
build increment
Former-commit-id: ff29d1e215 [formerly 4b252ba378] [formerly 8178f1396b695988589804287ea38a8dacf34c44 [formerly 668c5ee330]]
Former-commit-id: 2d68043cdfa717e98da2299fc90407abab9acfe2 [formerly 0b5fac3877]
Former-commit-id: 8b8a367019
|
2015-04-17 10:38:28 -06:00 |
|
mjames-upc
|
8a681fea2a
|
build update for 14.4.1: with these edits CAVE will finally build, but only if you use previous version of eclipse with current PyDev update, which is stupid because Raytheon says to use current eclipse which breaks on build attempts. smh.
Former-commit-id: c3e1cc66e6 [formerly 6f67b802f0] [formerly 971b16644f0a85387c661f26aa5a530e66c7998e [formerly 5756a3cde9]]
Former-commit-id: 2603f49de242adb24e0b33768ad64fe1a8f95b61 [formerly c30abec01b]
Former-commit-id: 0d371744a4
|
2015-03-06 13:42:26 -07:00 |
|
AWIPS User
|
ea30abe01b
|
merge upc development orphan branch into upc_14.4.1
Former-commit-id: 4458299928 [formerly 06a7f2ad9d] [formerly 1f4613a97ecb170f991ddd5ca9be32b5c63945b0 [formerly c9f28fd594]]
Former-commit-id: 76393e9e3ea8a386189eecfc4953a49d04ba95df [formerly 892c265b12]
Former-commit-id: 1ac670fc00
|
2015-03-01 12:44:45 -07:00 |
|
mjames-upc
|
38cf8403cb
|
a lot of build updates for 14.4.1. removed desktop autostart stuff, edits to get wes2bridge to build, and reoganization of UPC build programs.
Former-commit-id: 1a280b79d6
|
2015-02-12 21:55:36 -07:00 |
|
mjames-upc
|
f5c4e36686
|
modified code BUILD - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 2ce37e10db
|
2015-01-12 14:12:30 -07:00 |
|
mjames-upc
|
886cd5940f
|
Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
|
2015-01-12 14:02:58 -07:00 |
|
mjames-upc
|
e29a717f80
|
moved awips2-edex-shapefiles RPM build to separate script, reduce time to run buildEDEX by 20 minutes
Former-commit-id: 38b0e2e9dd
|
2015-01-08 17:08:33 -07:00 |
|
David Lovely
|
0dba443423
|
Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: d25fcc9155 [formerly 208dd5de01] [formerly 240927c241] [formerly d25fcc9155 [formerly 208dd5de01] [formerly 240927c241] [formerly e56002debf [formerly 240927c241 [formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]]]]
Former-commit-id: e56002debf
Former-commit-id: cc40ff8301 [formerly 9f09af1c8a] [formerly b42af842cf64f96a786847d263d90f2eab6ef2ca [formerly d860af2218]]
Former-commit-id: ba931f8d29a5e299b40d1de07af37d22f7100e4b [formerly b67b97803c]
Former-commit-id: 9c401ce4ea
|
2015-01-07 12:03:10 -06:00 |
|
Bryan Kowal
|
4b83570666
|
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: 4aaf636e18 [formerly 289689e774] [formerly 19f6551c88] [formerly 4aaf636e18 [formerly 289689e774] [formerly 19f6551c88] [formerly 48ec32e595 [formerly 19f6551c88 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]]
Former-commit-id: 48ec32e595
Former-commit-id: 0e79d9e7a8 [formerly aba4679eb6] [formerly 39a25df1c5ea9e51a812bdbf1ec764e207623861 [formerly 9f5297504d]]
Former-commit-id: 53663102c30f8e33519ac669cb7464894a692105 [formerly ec8371db52]
Former-commit-id: 258f7a93ca
|
2014-12-05 09:20:23 -06:00 |
|
Bryan Kowal
|
c529dfdcb5
|
Omaha #3508 - created the yajsw rpm
Former-commit-id: d1ae8959d9 [formerly a89e9d96b9] [formerly 8be5362dbd] [formerly d1ae8959d9 [formerly a89e9d96b9] [formerly 8be5362dbd] [formerly 127db6aaee [formerly 8be5362dbd [formerly 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21]]]]
Former-commit-id: 127db6aaee
Former-commit-id: a66bd674bd [formerly aa0f4129c4] [formerly 3eadda817d8defa22fb56beb2929a690f89c1d99 [formerly c3bb142d88]]
Former-commit-id: baa6b945182280fb3280c32ab3139fed2fa645e0 [formerly 27686d8783]
Former-commit-id: 40434c2d72
|
2014-12-04 16:26:55 -06:00 |
|
Greg Armendariz
|
8a2e543012
|
Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b
Former-commit-id: 397acc7119 [formerly d3295027c2] [formerly ad5e3134e4] [formerly 397acc7119 [formerly d3295027c2] [formerly ad5e3134e4] [formerly d7af478037 [formerly ad5e3134e4 [formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]]]]
Former-commit-id: d7af478037
Former-commit-id: a9b0a92197 [formerly fa3eda0370] [formerly 50e262e3a15040bee7135aa4d01fb597da141d7a [formerly 756d33bf89]]
Former-commit-id: 7709850b9549798fe9bbcd8cc7650201a0d0eae5 [formerly 1fbd4f0038]
Former-commit-id: a17f0cb3e1
|
2014-11-18 13:48:19 -06:00 |
|
David Lovely
|
e98fca85c7
|
Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work.
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325
Former-commit-id: 92f11c79c1 [formerly 132ac21917] [formerly e0525f7816] [formerly 92f11c79c1 [formerly 132ac21917] [formerly e0525f7816] [formerly 3686a36ae7 [formerly e0525f7816 [formerly 89acb99f0639f34e4ba3530e49c81ce5dda42785]]]]
Former-commit-id: 3686a36ae7
Former-commit-id: bf0c744699 [formerly bf66116b50] [formerly a54e6fce82494d16799fb7d7e0b2263a4942e965 [formerly 66e3669532]]
Former-commit-id: a5ea213f8d74189bc56129574e7cc290f7e60b8f [formerly 40087c34e4]
Former-commit-id: bcb7dbce05
|
2014-11-13 10:59:00 -06:00 |
|
David Lovely
|
1401310851
|
Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470
Former-commit-id: dca2a23b04 [formerly b32d54c7f9] [formerly 625e83c445] [formerly dca2a23b04 [formerly b32d54c7f9] [formerly 625e83c445] [formerly 1a191cac55 [formerly 625e83c445 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]]]
Former-commit-id: 1a191cac55
Former-commit-id: 7c2eea2dd1 [formerly 3b7d20e623] [formerly cedbebb180b50bca15b89397222ee077a0fe89d0 [formerly b9451471ac]]
Former-commit-id: 01568b110423cde499e076cbfd07238836c16bc0 [formerly 1b3334a183]
Former-commit-id: 0b76e0a9b6
|
2014-11-10 08:27:28 -06:00 |
|
mjames-upc
|
0ca315be49
|
build scripts updates
Former-commit-id: a9e2247af9
|
2014-10-28 19:51:00 -06:00 |
|
David Lovely
|
93303325e9
|
Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created.
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc
Former-commit-id: 58c9e93aba [formerly 3d1fa8e1b8] [formerly 2f9c1e8303] [formerly 58c9e93aba [formerly 3d1fa8e1b8] [formerly 2f9c1e8303] [formerly 081ea4a12a [formerly 2f9c1e8303 [formerly b50c56c84968f4765245ec12fa33c3037b0380ff]]]]
Former-commit-id: 081ea4a12a
Former-commit-id: bc6abe72cc [formerly 28639c96c0] [formerly b68ae40acd3573661dd51d2bc668630763f62d58 [formerly 2f02a475a8]]
Former-commit-id: 291b53f372501c49cf6330c7a312e81747e764b0 [formerly ab038bc4c7]
Former-commit-id: 396eb2cda5
|
2014-10-23 15:55:26 -05:00 |
|
mjames-upc
|
534a084919
|
build increment for python and postgres
Former-commit-id: e3d26435d4
|
2014-10-16 17:00:56 -06:00 |
|
Ron Anderson
|
92071a03c6
|
Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8
Former-commit-id: f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f44ac32b1e [formerly ec1530c5e8 [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]]]]
Former-commit-id: f44ac32b1e
Former-commit-id: 88aae9d195 [formerly 841e270b6f] [formerly 8544b7d76afb53dadb3f5d65587b33d13b6e8ede [formerly b59e41705c]]
Former-commit-id: a736762ec6fda2c02a849ad08fec20a2cb13b150 [formerly 50acd7dc68]
Former-commit-id: 2d64e79be9
|
2014-09-30 14:09:31 -05:00 |
|
mjames-upc
|
f8d3334985
|
build updates
Former-commit-id: a38a3b112e
|
2014-09-26 17:32:27 -06:00 |
|
mjames-upc
|
badf695f7d
|
UPC build updates
Former-commit-id: 3c934c7e2d
|
2014-09-10 15:10:37 -06:00 |
|
mjames-upc
|
8b5d136564
|
build edits, LDM and EDEX updates for /data_store -> /awips2/data_store. Added -httpd build option for RPMs.
Former-commit-id: 03271b03a2
|
2014-07-23 12:42:51 -06:00 |
|
mjames-upc
|
0b8a58eec9
|
ldm and edex-upc rpmbuild.
Former-commit-id: 6b3d83313a
|
2014-07-16 20:22:10 -06:00 |
|
Bryan Kowal
|
7a007960cf
|
Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
Former-commit-id: ee4b7c4ee8 [formerly 58a2ae8bc8] [formerly 98a310f4a7] [formerly ee4b7c4ee8 [formerly 58a2ae8bc8] [formerly 98a310f4a7] [formerly 6a197f845d [formerly 98a310f4a7 [formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]]]
Former-commit-id: 6a197f845d
Former-commit-id: b2d4debdce [formerly ac1b94c63f] [formerly ed8425afeb482fb12b827adf7402a0eda661e5fb [formerly 0fdfc0fd4a]]
Former-commit-id: d14384ae75f25093f489626ca51658c2d08fe2cc [formerly d1898937e0]
Former-commit-id: ec5f9c6623
|
2014-07-08 09:31:21 -05:00 |
|
mjames-upc
|
c68c310b96
|
chmod 775 for /awips2/edex/data/manaul directory. various other build updates and reoganization.
Former-commit-id: ca0e1e663c
|
2014-07-07 21:14:53 -06:00 |
|
mjames-upc
|
cfea8da633
|
added awips2-edex-upc RPM build. various updates relates to other RPM builds. incremented LDM rpm.
Former-commit-id: 42c43cf844
|
2014-07-07 16:39:10 -06:00 |
|
mjames-upc
|
df3f2fa30e
|
First build Unidata 14.2.1. Added directory rpms/unidata/ which includes current build script (adapted from NCEP) and custom environment file all based on /awips2 directory home for everything needed. Edits made to awips.product and developer.product to remove a perspective flag which was causing errors on RPM install. Qpid build for .7 added; edit made to build for .18. awips2-pgadmin RPM spec file updated to remove the stringent rhel6 package name and version requirements, allowing to install without error across different linux systems. Installer.topo edits for awipscm, the as-yet-un-committed shapefile directory that apparently is needed to build RPMs, but not included in the source (I had to extract the files from previously built RPMs in order to build the same RPM... bootstrap much?)
Former-commit-id: a88e08a7ac
|
2014-06-11 17:09:46 -06:00 |
|
Steve Harris
|
86d6a0cd4d
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3 [formerly 0e9d0b2ef5] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427]
Former-commit-id: 5fda99b1fe
|
2014-05-28 09:01:00 -05:00 |
|
Greg Armendariz
|
b8c298cd30
|
Omaha #3215 - Correct script
Former-commit-id: c7f349d5a5 [formerly 9c26a31d27] [formerly ac528037a1] [formerly c7f349d5a5 [formerly 9c26a31d27] [formerly ac528037a1] [formerly 73765c31ca [formerly ac528037a1 [formerly 2565b4c918f9215fd65a5dc44778db3a200da8bf]]]]
Former-commit-id: 73765c31ca
Former-commit-id: 772f68bbe4 [formerly be8b2a480b] [formerly 256e740af4db40ebc9aee9703b37df6292a84fff [formerly c7040bce82]]
Former-commit-id: 51888b856816f07cc52eb276ede7075340f060c7 [formerly 6a487942e9]
Former-commit-id: f746096b52
|
2014-05-27 15:19:37 -05:00 |
|
Greg Armendariz
|
336be12f33
|
Omaha #3215 - Add option for RPM build,
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5
Former-commit-id: 45856116c0 [formerly 0806135d2e] [formerly 265a455ca1] [formerly 45856116c0 [formerly 0806135d2e] [formerly 265a455ca1] [formerly a2e157ed35 [formerly 265a455ca1 [formerly 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b]]]]
Former-commit-id: a2e157ed35
Former-commit-id: 9301eb1844 [formerly db01c4b45e] [formerly 220403a4b2cfd4083d722e770928cca821f9a677 [formerly 81ca8ed4c6]]
Former-commit-id: 559db09b22e37642d03476bd447ec4aa342fe2ad [formerly bdbdfdaa7a]
Former-commit-id: 1a976cb67b
|
2014-05-27 14:56:33 -05:00 |
|
Steve Harris
|
cf2950abdb
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
|
2014-05-27 14:48:24 -04:00 |
|
mjames-upc
|
7479b318af
|
update env var and RPM build scripts
Former-commit-id: 2bec1dedfb
|
2014-05-16 09:49:33 -06:00 |
|
Steve Harris
|
24df80c520
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
9bc1055c87
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
|
2014-05-12 14:07:11 -04:00 |
|
Steve Harris
|
55644af2ca
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 4b54c0498e [formerly 927a87b126] [formerly b9b41ab717fa5a9d55725f89e087b2c62f5811fa [formerly b797b4b1fa]]
Former-commit-id: 66b0c211b5eee3caba67b313d56f7fda8fa60cc9 [formerly 17318b1870]
Former-commit-id: 4fe84ba0fd
|
2014-05-05 08:21:02 -05:00 |
|
mjames-upc
|
b4c0da1971
|
first commit orphan branch from remotes/origin/ncep_14.2.1
Former-commit-id: 27eaf7aa70
|
2014-04-30 19:22:58 -06:00 |
|
Richard Peter
|
e748b7c1e5
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
19b4bb7dcc
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
|
2014-04-25 11:06:11 -04:00 |
|
Brad Gonzales
|
f149cab30e
|
Issue #3024 Removed edex feature build.xml files. Removed bkowal from the buildEnvironment.sh script.
Change-Id: Ic1ee22e604a68c2c475cb002901413c55bda6bd1
Former-commit-id: 9c6f68a56f [formerly 5957c45cea] [formerly fdfac581d6] [formerly 9c6f68a56f [formerly 5957c45cea] [formerly fdfac581d6] [formerly 1fcffc5db8 [formerly fdfac581d6 [formerly fdf7e47c2ddcfe4154ee117a0b5a722cd420df20]]]]
Former-commit-id: 1fcffc5db8
Former-commit-id: 26b95f945e [formerly c11506a0c9] [formerly 86a837c9ba02a232e781433a5fdcf46bfeb6af6d [formerly 679a623d87]]
Former-commit-id: 6e902fcd67eea53404b5aed28b2891e7daea7551 [formerly da2d3c0fe9]
Former-commit-id: 4e5664e0a2
|
2014-04-22 15:39:08 -05:00 |
|
Brad Gonzales
|
c945c549e0
|
Issue #3035 Removed jrockit missioncontrol from awips2 java rpm build.
Change-Id: I558e0f080b46c76cbdfb759ef1c1a701925273ca
Former-commit-id: ed82a7f477 [formerly 3a3e0be7a4] [formerly 90c7e699fa] [formerly ed82a7f477 [formerly 3a3e0be7a4] [formerly 90c7e699fa] [formerly 4c21afaa1b [formerly 90c7e699fa [formerly 254c7e0298ba7fb3ad91af2d51a1bd41b0535631]]]]
Former-commit-id: 4c21afaa1b
Former-commit-id: dd469cc103 [formerly 258ddf9036] [formerly 44e44ccc27afeb322968ac9c4d880dc5c0ee5207 [formerly 17ac32a672]]
Former-commit-id: c107369d06cae6babf5552c5a31602cd293d8f07 [formerly 55e11bf157]
Former-commit-id: 3fb2ac5ee2
|
2014-04-22 12:23:15 -05:00 |
|
Brian.Dyke
|
d2d085aa39
|
Merged 13.5.5-1 into 1412
Former-commit-id: 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]]
Former-commit-id: 35ad867281
Former-commit-id: 4808bb32bb [formerly c0266e8988] [formerly 8837283d998164da174b3d8f18d42dbebeeb1257 [formerly 72618c4214]]
Former-commit-id: 856567af7814ca29ea4e90337f3ec6c13981ce04 [formerly 737283b94a]
Former-commit-id: 73efa466f9
|
2014-04-16 12:09:12 -04:00 |
|
Richard Peter
|
52a54f5e9f
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
ae3f5dbff6
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
|
2014-04-04 12:57:32 -04:00 |
|
Brad Gonzales
|
350514f204
|
Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver
rpm to replace it. Changed dependency references to httpd-collaboration to refer to collab-dataserver.
Amend: Updated call to status in init script.
Redirect start.sh error output to an error file.
Use macro to define ant opts in component.spec.
Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4
Former-commit-id: 9ff7dd12aa [formerly fe8e6a1fa1] [formerly 4fa60427b4] [formerly 9ff7dd12aa [formerly fe8e6a1fa1] [formerly 4fa60427b4] [formerly f0189d61ca [formerly 4fa60427b4 [formerly d7466d36140c94b5ef4e57fea25526231912e018]]]]
Former-commit-id: f0189d61ca
Former-commit-id: efb4981a15 [formerly 907d09bc20] [formerly 7c33a8781ee872ff0c5e225ac1d343ecd2c0eaee [formerly 3954cd6bae]]
Former-commit-id: 2291558778d560b4564dfd6237e7c32f3bb038d2 [formerly 69f7034551]
Former-commit-id: cd22105a5e
|
2014-04-03 17:47:58 -05:00 |
|
Steve Harris
|
24c55c616c
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
|
2014-03-17 15:55:41 -05:00 |
|
Brian.Dyke
|
f95e1ed18b
|
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 39ef07d49f [formerly 57f7e4b084] [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]]
Former-commit-id: b74e99a753d5ddafa0c2b9e7a7ee76f3251376c4 [formerly 35427557c4]
Former-commit-id: 5fb2fe9266
|
2014-03-14 11:13:30 -04:00 |
|