Commit graph

15 commits

Author SHA1 Message Date
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
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
Richard Peter
7434f3c20e Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 20fa07c6d3 [formerly 23eafaba3d] [formerly 2457d0e6f7] [formerly 20fa07c6d3 [formerly 23eafaba3d] [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 9c162858f4 [formerly 746bbb0885] [formerly 2a8f875c3a3a12752593d61bb77d88a0341b5368 [formerly f7d8755ba9]]
Former-commit-id: 0fc5096e00ed840082ba093d3d160ad0e811a828 [formerly bf3ddbb62b]
Former-commit-id: 59e9fe78f2
2014-12-12 10:36:04 -06:00
Shawn Hooper
32617ce462 VLab Issue #5375 - Update spec file for VADATUMS tar file.
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13

Former-commit-id: 8aff77b52b [formerly 3455a07e99] [formerly 50cd8ace64] [formerly 8aff77b52b [formerly 3455a07e99] [formerly 50cd8ace64] [formerly f88d320e60 [formerly 50cd8ace64 [formerly 83e81ee0af2d612f08f32e760e9f4d00ee1dd7aa]]]]
Former-commit-id: f88d320e60
Former-commit-id: 07efce840f [formerly a872090b54] [formerly 821313f7493c9d20aa3abc7eb756ae69fa0a6d6f [formerly 58fed17369]]
Former-commit-id: 2a9aba75f3540bf8f26d59a981f468e21bff828c [formerly f543901a53]
Former-commit-id: da77e0bcd3
2014-11-19 14:08:27 -05: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
Bryan Kowal
f295c59dc4 Omaha #3475 - PostgreSQL Upgrade.
amend: vacuum databases after upgrade due to: http://www.postgresql.org/docs/9.3/static/release-9-3-2.html E.4.2 VACUUM tests
amend: update viz xdat to use the newer PostgreSQL jdbc driver
amend: fix formatting

Change-Id: Icda3348eea3e5edd879acb3a897bc530e73fb7f3

Former-commit-id: b805f1db0d [formerly 3d68ae0c78] [formerly f6bc96829e] [formerly b805f1db0d [formerly 3d68ae0c78] [formerly f6bc96829e] [formerly a2be914331 [formerly f6bc96829e [formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]]]]
Former-commit-id: a2be914331
Former-commit-id: 69a0dce7cb [formerly c15190b7f6] [formerly 7264efe3b00ab6cbe7db1240eea4304e54781900 [formerly 0894026a79]]
Former-commit-id: c201d541cc56ace0f640825213c54136d197f0bf [formerly 0b5fc6aa0e]
Former-commit-id: a60ab0de0c
2014-08-12 15:10:39 -05:00
Greg Armendariz
a31a4abfb3 Omaha #3327 - update topo rpm to include gmted2010.h5
Former-commit-id: 4cfb1933ea [formerly b369662fd9] [formerly f6842be3ed] [formerly 4cfb1933ea [formerly b369662fd9] [formerly f6842be3ed] [formerly 7f7c443494 [formerly f6842be3ed [formerly 8cef78cfc21dd561ebfd5d1af60da915d2a64961]]]]
Former-commit-id: 7f7c443494
Former-commit-id: e10df89eb8 [formerly 05fda7902b] [formerly 9af1116edfd72d8124912b05dac9254ace507433 [formerly 3fc7b439f2]]
Former-commit-id: 108a14a7f2db6fcd9be96299751a8c442251bdc3 [formerly ac45aa9132]
Former-commit-id: 1e7b9aa541
2014-08-06 09:46:45 -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
Greg Armendariz
12b9229488 Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly 4981b6a438 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: b069ee1ea3 [formerly 94a55e5c31] [formerly 9e10990e64fcefc2ae835d7e6bae34e0905df35d [formerly 784235ab9f]]
Former-commit-id: ba6055d54db48a1a72242f8bdaf2f1b74a5a8483 [formerly 2cd476cc62]
Former-commit-id: e9ba949734
2014-04-30 15:42:42 -05:00
Ron Anderson
86f067bac9 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
2014-02-13 10:10:34 -06:00
Bryan Kowal
f1854dd760 Issue #1663 - PostgreSQL Upgrade
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
   * geos 3.3.7
   * postgis 2.0.2
   * proj 4.8.0
   * gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers

Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8

Former-commit-id: 9e678feaf8 [formerly db02ab18ed] [formerly 729bc9c4bb] [formerly 9e678feaf8 [formerly db02ab18ed] [formerly 729bc9c4bb] [formerly 5e86ef080e [formerly 729bc9c4bb [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]]]
Former-commit-id: 5e86ef080e
Former-commit-id: 0b6a31d7ca [formerly f6139755a5] [formerly 916fa7115cb561d798c47318a5834ec0854bf491 [formerly 58e035a024]]
Former-commit-id: 53b06b05ba798c5f2f0c58de3b9cd5f1c88b5850 [formerly 1e9054ce15]
Former-commit-id: ea0950d836
2013-03-13 14:44:05 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00
Bryan Kowal
a89f0a64f0 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]]
Former-commit-id: ea1c82452b
Former-commit-id: 69f4822ad1 [formerly 9f6780c4dd] [formerly e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010]]
Former-commit-id: ed7bf459df1503ce7bd9500dc984c56a535b768f [formerly dafb6b18d8]
Former-commit-id: bb662ca175
2012-01-20 13:38:00 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00