Bryan Kowal
8e27924557
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: 0800c14061
[formerly cca3f43736
] [formerly c797715efe
[formerly d0fe712b37f7890c547470b24139635183ee9e1e]]
Former-commit-id: c797715efe
Former-commit-id: 671e600a62
2013-04-15 09:40:43 -05:00
Bryan Kowal
a57a457c79
Issue #1850 - the ebxml schema will now be created within the metadata database
...
Former-commit-id: d6e3d52126
[formerly 8d63244b4e
] [formerly 2dbd62e9ce
[formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]
Former-commit-id: 2dbd62e9ce
Former-commit-id: b31ade0770
2013-04-02 10:49:46 -05:00
Steve Harris
7b27767d7e
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 736bb45741
[formerly 140765a43e
] [formerly 437a04011a
[formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 437a04011a
Former-commit-id: 0b48e96314
2013-04-01 12:19:04 -05:00
Bryan Kowal
131e260337
Issue #1821 - re-compile grib2.so 32-bit and 64-bit
...
Former-commit-id: 203a3d5200
[formerly da99727625
] [formerly 2da2b370db
[formerly f7f382d880134acb2f84bef990302aa91784c2d2]]
Former-commit-id: 2da2b370db
Former-commit-id: 998fbe8769
2013-03-28 09:48:27 -05:00
Steve Harris
6e48567370
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 069ee8a748
[formerly 9a321b6ac8
] [formerly 3073951b3d
[formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]
Former-commit-id: 3073951b3d
Former-commit-id: a4bf236cc7
2013-03-27 22:16:15 -05:00
Roger Ferrel
7244b4d23c
Issue #1828 Fix intlsigmets and text pattern.
...
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0
Former-commit-id: 6a4bd66abc
[formerly 19074d3053
] [formerly 74389834de
[formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]
Former-commit-id: 74389834de
Former-commit-id: 4c5aa32169
2013-03-26 14:47:48 -05:00
Steve Harris
5bb29627dc
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 4e54025fcd
[formerly 5fcfaf4360
] [formerly 65df96a419
[formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 65df96a419
Former-commit-id: 346b97a39a
2013-03-26 12:47:40 -05:00
Steve Harris
02147470db
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 85104939ac
[formerly e71c69c383
] [formerly 9ff8a94193
[formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: 9ff8a94193
Former-commit-id: b926ff60b3
2013-03-26 12:44:24 -05:00
Steve Harris
4f2e9aec0d
13.3.1-13 baseline
...
Former-commit-id: 792171756f
[formerly c77a452f5a
] [formerly c65f3e68e5
[formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
2013-03-26 12:43:07 -05:00
Steve Harris
f80f98cee2
13.3.1-12 baseline
...
Former-commit-id: be96282207
[formerly 0be473728a
] [formerly aaac0b51e5
[formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Greg Armendariz
1884b6dce3
Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
...
Former-commit-id: 1e1aea8a40
[formerly 6af1a22e56
] [formerly 85113a66b6
[formerly 7403214a115b0b856f94da1e86288307af952d77]]
Former-commit-id: 85113a66b6
Former-commit-id: ccabddace6
2013-03-21 12:55:59 -05:00
Bryan Kowal
88b0c2e120
Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
...
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694
Former-commit-id: 574f6cf4ad
[formerly 4e37fa6627
] [formerly 5b15c6fcaa
[formerly b756d55e91a553623fb61de2673f87d81351ca9b]]
Former-commit-id: 5b15c6fcaa
Former-commit-id: 8141f49211
2013-03-21 10:04:29 -05:00
Bryan Kowal
ac0ef6e7b9
Issue #1663 - awips2-database will no longer install site-specific databases.
...
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
will be purged by the localization rpm once it is finished with them
Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6
Former-commit-id: 4d3731bf6d
[formerly ab135933da
] [formerly 722d068105
[formerly e4181aff738a926738ccabcd2c09706670a43924]]
Former-commit-id: 722d068105
Former-commit-id: 5ab931d15e
2013-03-21 09:50:48 -05:00
Steve Harris
8db98c2d71
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 0055a3213d
[formerly e2496455b2
] [formerly 0379be06d2
[formerly 67b25fa95817acafd25818c825656236597b6e09]]
Former-commit-id: 0379be06d2
Former-commit-id: 4fc2bb7bba
2013-03-20 16:09:26 -05:00
Steve Harris
f4e26fd94d
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: a9ced3a7ef
[formerly fa15f03e1b
] [formerly dc419068f0
[formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: dc419068f0
Former-commit-id: 31044eabd1
2013-03-20 16:06:20 -05:00
Steve Harris
e9f0328808
13.3.1-10 baseline
...
Former-commit-id: 57f4676b6c
[formerly 073687d9a9
] [formerly 7078eec1b1
[formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
2013-03-20 15:53:01 -05:00
Bryan Kowal
6b8538f7f5
Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
...
Former-commit-id: 448518579a
[formerly cbe9b30266
] [formerly 74b4bb0891
[formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]
Former-commit-id: 74b4bb0891
Former-commit-id: 7628860bfe
2013-03-19 13:27:38 -05:00
Steve Harris
2a26783ba7
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: 28ef804e1b
[formerly b8f0635ad6
] [formerly 7fcf9f1cb2
[formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
2013-03-18 16:52:00 -05:00
Bryan Kowal
3e8d5449fc
Issue #1741 - what was once two is now one
...
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: a93dcff1b5
[formerly b954bc17bf
] [formerly 7fd035256d
[formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]
Former-commit-id: 7fd035256d
Former-commit-id: 66e2ed79ec
2013-03-18 16:36:33 -05:00
Bryan Kowal
f6139755a5
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: db02ab18ed
[formerly 729bc9c4bb
] [formerly 5e86ef080e
[formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]
Former-commit-id: 5e86ef080e
Former-commit-id: 58e035a024
2013-03-13 14:44:05 -05:00
Dave Hladky
9e97fc9efe
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 765be278bb
[formerly 38b952a220
] [formerly 5dc454c7ef
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Steve Harris
ed5f1dbab6
13.3.1-7 baseline
...
Former-commit-id: 97d2f521e4
[formerly a72254cc75
] [formerly e12ed113ae
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Steve Harris
2e1dbdc10d
13.3.1-6.1 baseline
...
Former-commit-id: 6d96471b9b
[formerly fa9d260c2b
] [formerly a062803c8c
[formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]
Former-commit-id: a062803c8c
Former-commit-id: bfa25f3330
2013-03-13 08:28:26 -05:00
Steve Harris
bca46a1354
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 36261cb095
[formerly 753a5213ab
] [formerly 0cd7e56e65
[formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 0cd7e56e65
Former-commit-id: d5bcdb0015
2013-03-12 16:04:23 -05:00
Dave Hladky
155903d135
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: 5c65862b8f
[formerly a1006667e0
] [formerly 4b08491880
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
Steve Harris
6fe4b16924
13.3.1-6 baseline
...
Former-commit-id: 2e110bd151
[formerly 3a4c7931e1
] [formerly 566b677d09
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
Steve Harris
4a0b8772ec
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 6b13492420
[formerly d5b80f9225
] [formerly aa0e9acefd
[formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
2013-03-05 12:29:44 -06:00
Steve Harris
b423579e4a
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 61a19a460b
[formerly 305dd72969
] [formerly 57f42761d7
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
2013-03-05 12:27:49 -06:00
Steve Harris
a240379588
13.3.1-5 baseline
...
Former-commit-id: 8123d5ac45
[formerly a89221c75b
] [formerly e26f7eb151
[formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
2013-03-05 10:47:06 -06:00
Bryan Kowal
0d9400b2ec
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Former-commit-id: d484acbca0
[formerly 3a8efd5edf
] [formerly 8b4dce1c3d
[formerly d466b647d0d810418a88c875f39e55d98d680aa1]]
Former-commit-id: 8b4dce1c3d
Former-commit-id: eba8ccc6cd
2013-03-04 17:58:04 -06:00
Bryan Kowal
5958c0a876
Issue #1739 - fix Wes2Bridge
...
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814
Former-commit-id: 9022c53d53
[formerly 20d3c6bcaa
] [formerly 86a1f16e37
[formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]
Former-commit-id: 86a1f16e37
Former-commit-id: ed6e1003ff
2013-03-01 11:49:09 -06:00
Steve Harris
81f1fb83a0
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: c2327ce33d
[formerly ea50a5db77
] [formerly d123c044c3
[formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: d123c044c3
Former-commit-id: 1c08acab38
2013-02-19 12:22:00 -06:00
Steve Harris
8cffb55371
13.2.1-8 baseline
...
Former-commit-id: 18da2e93d7
[formerly f81b382c04
] [formerly 053156f02e
[formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
2013-02-18 09:09:41 -06:00
Brad Gonzales
8fc5c18ebd
Issue #1517 Added SPC Prob menu changes.
...
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 35cc853c74
[formerly f459554e33
] [formerly 5bc6dd5498
[formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]
Former-commit-id: 5bc6dd5498
Former-commit-id: f3ef309293
2013-02-04 08:52:33 -06:00
Steve Harris
73d9455c65
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: c218786986
[formerly 658bea377b
] [formerly ec56acde81
[formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: ec56acde81
Former-commit-id: 6383bf8ed2
2013-01-31 10:19:14 -06:00
Steve Harris
75f6e61e6f
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e655d297f7
[formerly 0505ed0a72
] [formerly 6040272573
[formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 6040272573
Former-commit-id: 513d49939f
2013-01-29 15:57:21 -06:00
Steve Harris
daca1c3e73
13.2.1-3 baseline
...
Former-commit-id: 283147571f
[formerly f45120a1f4
] [formerly 7a739c6a5b
[formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 3edfa1e0be
2013-01-29 15:52:43 -06:00
Bryan Kowal
f4e7bead66
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: a960b34230
[formerly 7116bb86ef
] [formerly fa511e980b
[formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]
Former-commit-id: fa511e980b
Former-commit-id: aefeada9d6
2013-01-29 09:51:54 -06:00
Steve Harris
251a9c0195
13.2.1-2 baseline
...
Former-commit-id: 0006a2b6cb
[formerly 7a7f7c45ca
] [formerly c3e4551dfa
[formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
2013-01-25 09:07:12 -06:00
Steve Harris
9d248cff7a
13.2.1-3 baseline
...
Former-commit-id: a5a0da5c02
[formerly 7435527b25
] [formerly 2b6ac028bd
[formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 2b6ac028bd
Former-commit-id: cc0fdef15c
2013-01-23 11:24:17 -05:00
Steve Harris
d9be4dce21
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd816
[formerly 83e9157df7
] [formerly 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
8ed6a53113
13.2.1-1 baseline
...
Former-commit-id: 48d1aa7732
[formerly 9771dfae6b
] [formerly c63f9bcae0
[formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
2013-01-23 11:13:03 -05:00
Bryan Kowal
bc757e5bc1
Issue #1490 - updated edex-environment
...
- actually include the modified files in the commit this time
- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot
Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d
Former-commit-id: 792c03d5f4
[formerly b4964c0a19
] [formerly 9e33969536
[formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]
Former-commit-id: 9e33969536
Former-commit-id: b47d484e70
2013-01-18 12:44:37 -06:00
Roger Ferrel
86d51634dc
Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
...
Changes based on code review and added listener to GridManager and unit test.
Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650
Former-commit-id: 972db12324
[formerly 1cd076671c
] [formerly 1e492b81ff
[formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]
Former-commit-id: 1e492b81ff
Former-commit-id: f10521f861
2013-01-16 16:53:29 -06:00
Richard Peter
79ef100838
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a966546e31
[formerly 3fb7d96ec1
] [formerly 1dbb34523b
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
2013-01-14 18:07:17 -06:00
Steve Harris
e34695538d
13.2.1-1 baseline
...
Former-commit-id: 5dfe4d10f1
[formerly e62172c8c7
] [formerly 81849e3cbb
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: 81849e3cbb
Former-commit-id: 8713dfc5ca
2013-01-14 18:42:21 -05:00
Richard Peter
80bf1d7a28
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: d0a6ba23e5
[formerly 029ebaa63a
] [formerly 328be6ac2b
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 328be6ac2b
Former-commit-id: 6a5a0d7d09
2013-01-09 17:55:05 -06:00
Steve Harris
82a1ed77a4
13.1.2-6 baseline
...
Former-commit-id: efd3392abe
[formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
2013-01-06 14:55:11 -06:00
Steve Harris
cd4185ef5c
13.1.2-2 baseline
...
Former-commit-id: 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Roger Ferrel
07fbeb2928
Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
...
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc
Former-commit-id: 8c4e70fa9a
[formerly 0c5d10e66a
] [formerly 43fd607a30
[formerly c1567c66f77077f9411a04f349a17d368424db5f]]
Former-commit-id: 43fd607a30
Former-commit-id: 6d4946290f
2012-12-18 09:00:46 -06:00