Richard Peter
7fbd24e723
Merge "Issue #1576 - updated qpid 0.18 rpms" into development
...
Former-commit-id: bb317b1acf
[formerly 221a6e1ca1
] [formerly bb317b1acf
[formerly 221a6e1ca1
] [formerly b774fadb60
[formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]]
Former-commit-id: b774fadb60
Former-commit-id: 2e02b222f2
[formerly fa4dd004f9
]
Former-commit-id: b4192e72c8
2013-02-05 09:25:55 -06:00
Bryan Kowal
c92b997909
Issue #1576 - updated qpid 0.18 rpms
...
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms
Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222
Former-commit-id: 145cd06eae
[formerly 1678618015
] [formerly 145cd06eae
[formerly 1678618015
] [formerly 09523f1e84
[formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]]
Former-commit-id: 09523f1e84
Former-commit-id: fe70d57c36
[formerly 513bda11bc
]
Former-commit-id: 88d5830873
2013-02-04 12:31:23 -06:00
Brad Gonzales
7253bbf20e
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 35cc853c74
[formerly f459554e33
] [formerly 5bc6dd5498
[formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 8fc5c18ebd
[formerly f3ef309293
]
Former-commit-id: adbfa7ced1
2013-02-04 08:52:33 -06:00
Steve Harris
2107a54161
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 c218786986
[formerly 658bea377b
] [formerly ec56acde81
[formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 73d9455c65
[formerly 6383bf8ed2
]
Former-commit-id: a74d58ce6f
2013-01-31 10:19:14 -06:00
Steve Harris
99bc358644
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e655d297f7
[formerly 0505ed0a72
] [formerly e655d297f7
[formerly 0505ed0a72
] [formerly 6040272573
[formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 75f6e61e6f
[formerly 513d49939f
]
Former-commit-id: ba97151132
2013-01-29 15:57:21 -06:00
Steve Harris
9ab34b7aeb
13.2.1-3 baseline
...
Former-commit-id: 283147571f
[formerly f45120a1f4
] [formerly 283147571f
[formerly f45120a1f4
] [formerly 7a739c6a5b
[formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: daca1c3e73
[formerly 3edfa1e0be
]
Former-commit-id: dbaf4a3e39
2013-01-29 15:52:43 -06:00
Bryan Kowal
1377ae600f
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: a960b34230
[formerly 7116bb86ef
] [formerly a960b34230
[formerly 7116bb86ef
] [formerly fa511e980b
[formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]]
Former-commit-id: fa511e980b
Former-commit-id: f4e7bead66
[formerly aefeada9d6
]
Former-commit-id: 662f471e5e
2013-01-29 09:51:54 -06:00
Bryan Kowal
b7f7312c7d
Issue #1503 - initial commit for build of Qpid 0.18 rpms
...
-created a qpid service script
Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3
Former-commit-id: ec584b4d4b
[formerly ff34587e94
] [formerly ec584b4d4b
[formerly ff34587e94
] [formerly 54697ff658
[formerly ee5806c98eb57680403e4f7768f92af1faa75de4]]]
Former-commit-id: 54697ff658
Former-commit-id: 45dd0b02ff
[formerly 0cf405d8d9
]
Former-commit-id: ce2d246314
2013-01-28 11:21:24 -06:00
Steve Harris
eafa141b90
13.2.1-2 baseline
...
Former-commit-id: 0006a2b6cb
[formerly 7a7f7c45ca
] [formerly 0006a2b6cb
[formerly 7a7f7c45ca
] [formerly c3e4551dfa
[formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 251a9c0195
[formerly 1153d80c5b
]
Former-commit-id: 27706b8dcb
2013-01-25 09:07:12 -06:00
Bryan Kowal
7ae14fdb20
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 792c03d5f4
[formerly b4964c0a19
] [formerly 9e33969536
[formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]]
Former-commit-id: 9e33969536
Former-commit-id: bc757e5bc1
[formerly b47d484e70
]
Former-commit-id: 75d8250852
2013-01-18 12:44:37 -06:00
Roger Ferrel
0435636b1e
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 972db12324
[formerly 1cd076671c
] [formerly 1e492b81ff
[formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]
Former-commit-id: 1e492b81ff
Former-commit-id: 86d51634dc
[formerly f10521f861
]
Former-commit-id: 722708105f
2013-01-16 16:53:29 -06:00
Richard Peter
e838f2db25
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 a966546e31
[formerly 3fb7d96ec1
] [formerly 1dbb34523b
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838
[formerly 345dfd2ca9
]
Former-commit-id: cd2014bf8d
2013-01-14 18:07:17 -06:00
Steve Harris
b4556ea28f
13.2.1-1 baseline
...
Former-commit-id: 5dfe4d10f1
[formerly e62172c8c7
] [formerly 5dfe4d10f1
[formerly e62172c8c7
] [formerly 81849e3cbb
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d
[formerly 8713dfc5ca
]
Former-commit-id: ebff2a6275
2013-01-14 18:42:21 -05:00
Richard Peter
ef2dc06b69
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: ae3ea75cbf
[formerly 1318f53902
] [formerly ae3ea75cbf
[formerly 1318f53902
] [formerly b8e42dabc0
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: fa6247baf7
[formerly aa9e16b038
]
Former-commit-id: 096134d917
2013-01-14 17:38:38 -06:00
Steve Harris
92f1e9416c
13.1.2-8 baseline
...
Former-commit-id: b864fdc303
[formerly e6217a17de
] [formerly b864fdc303
[formerly e6217a17de
] [formerly 06b8eb8db0
[formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 7d0109a349
[formerly 3caf592e83
]
Former-commit-id: 066c14dcd2
2013-01-11 16:19:07 -05:00
Richard Peter
398b47967d
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: d0a6ba23e5
[formerly 029ebaa63a
] [formerly d0a6ba23e5
[formerly 029ebaa63a
] [formerly 328be6ac2b
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28
[formerly 6a5a0d7d09
]
Former-commit-id: 709af3b25e
2013-01-09 17:55:05 -06:00
Bryan Kowal
1996f92f7e
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: ab8b346489
[formerly c8a43edd9e
] [formerly ab8b346489
[formerly c8a43edd9e
] [formerly d6b4cb65f4
[formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a
[formerly 146c43a606
]
Former-commit-id: 0136f9d5a3
2013-01-07 12:16:01 -06:00
Steve Harris
b7f180d9d3
13.1.2-6 baseline
...
Former-commit-id: efd3392abe
[formerly 8e5f9e0e6c
] [formerly efd3392abe
[formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4
[formerly dbcae57f57
]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0
13.1.2-2 baseline
...
Former-commit-id: 51208e5515
[formerly c0c1d56f3a
] [formerly 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c
[formerly 941337c553
]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Bryan Kowal
7138f2a20f
Issue #1373 - prevent file naming conflicts
...
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02
Former-commit-id: 94fe1c8f59
[formerly 9079c2dd3f
] [formerly 94fe1c8f59
[formerly 9079c2dd3f
] [formerly 2c9e5d68fa
[formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]]
Former-commit-id: 2c9e5d68fa
Former-commit-id: 5aed64be97
[formerly 6580901b03
]
Former-commit-id: ad30a7fb6a
2013-01-05 10:40:10 -06:00
Bryan Kowal
a14d25ded0
Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
...
Former-commit-id: 2d9e54ddf8
[formerly 9062ed93d7
] [formerly 2d9e54ddf8
[formerly 9062ed93d7
] [formerly e131b5bc72
[formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]]
Former-commit-id: e131b5bc72
Former-commit-id: ce21e23e52
[formerly 8a4bc85bad
]
Former-commit-id: d2cd60bb5c
2013-01-04 12:50:37 -06:00
Richard Peter
e8d1469a70
Issue #1373 : Update jvm startup to load a service list for services to start.
...
Former-commit-id: af5b616282
[formerly 1c560f5013
] [formerly af5b616282
[formerly 1c560f5013
] [formerly c1765f776c
[formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]
Former-commit-id: c1765f776c
Former-commit-id: 9f991104dd
[formerly 424cb12ef6
]
Former-commit-id: 6fd64a20fa
2013-01-03 16:27:32 -06:00
Richard Peter
cec63c30c7
Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
...
Former-commit-id: 314bcffd15
[formerly c3e9f40479
] [formerly 314bcffd15
[formerly c3e9f40479
] [formerly 45f901c1b0
[formerly da48ac436f44dcff85723dfd5befaee9101b6978]]]
Former-commit-id: 45f901c1b0
Former-commit-id: a608ba1a88
[formerly 54778e7490
]
Former-commit-id: 7c4641be8e
2012-12-18 13:08:40 -06:00
Roger Ferrel
7143fb78dd
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 8c4e70fa9a
[formerly 0c5d10e66a
] [formerly 43fd607a30
[formerly c1567c66f77077f9411a04f349a17d368424db5f]]]
Former-commit-id: 43fd607a30
Former-commit-id: 07fbeb2928
[formerly 6d4946290f
]
Former-commit-id: 95e6d9e752
2012-12-18 09:00:46 -06:00
Bryan Kowal
f48df7de50
Issue #1416 : added the python package shapely
...
- shapely and dependencies will now be built as part of the
32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
MSFT Windows environment
Former-commit-id: ef0b12813d
[formerly 8d1e29448a
] [formerly ef0b12813d
[formerly 8d1e29448a
] [formerly 5e22c24657
[formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]]
Former-commit-id: 5e22c24657
Former-commit-id: 976834171e
[formerly 6103e7c485
]
Former-commit-id: bf96e5cf59
2012-12-17 15:27:43 -06:00
Bryan Kowal
7e19ae6378
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds
Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396
Former-commit-id: 7fb4e993e6
[formerly 660a9b615f
] [formerly 7fb4e993e6
[formerly 660a9b615f
] [formerly f39489c44c
[formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]]
Former-commit-id: f39489c44c
Former-commit-id: 8579adf932
[formerly c44c4bd061
]
Former-commit-id: f256955776
2012-12-16 21:40:26 -06:00
Richard Peter
5faf3a22bd
Revert "Issue #1262:"
...
This reverts commit 95a0a4664f
[formerly 83e1f8cc0a
] [formerly bad53d1b7f
[formerly 9490652103
]] [formerly 0970259114
] [formerly c3da463f39
[formerly a210f08acc
] [formerly c3da463f39
[formerly a210f08acc
] [formerly 0970259114
[formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]]
Former-commit-id: 9d03a53fb5
[formerly 9a7cfa2383
] [formerly 9d03a53fb5
[formerly 9a7cfa2383
] [formerly f37f948456
[formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]]
Former-commit-id: f37f948456
Former-commit-id: 2100b136a9
[formerly 48641ca26f
]
Former-commit-id: 463f7c5d9b
2012-12-16 20:37:21 -06:00
Bryan Kowal
95a0a4664f
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
Former-commit-id: c3da463f39
[formerly a210f08acc
] [formerly c3da463f39
[formerly a210f08acc
] [formerly 0970259114
[formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]
Former-commit-id: 0970259114
Former-commit-id: bad53d1b7f
[formerly 9490652103
]
Former-commit-id: 83e1f8cc0a
2012-12-13 12:40:31 -06:00
Roger Ferrel
42c5a7b343
Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
...
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4
Former-commit-id: 6929a73900
[formerly b677a5ba3d
] [formerly 6929a73900
[formerly b677a5ba3d
] [formerly aefa650cda
[formerly b406c990607a06678a58e36118edcddaab073b26]]]
Former-commit-id: aefa650cda
Former-commit-id: 662d51cda1
[formerly f64a99d554
]
Former-commit-id: d7a28eedfd
2012-12-11 15:43:54 -06:00
Steve Harris
b0a60923c4
Merge branch 'ss_builds' (12.12.1-12) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: 4d4771ee3a
[formerly 43ddfe98c4
] [formerly 4d4771ee3a
[formerly 43ddfe98c4
] [formerly f6988eefff
[formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d
[formerly 6287b32e7d
]
Former-commit-id: ebcc9975c4
2012-12-11 08:45:53 -06:00
Steve Harris
f8a9ae24cb
12.12.1-12 baseline
...
Former-commit-id: 89def5cf03
[formerly e8e41630e8
] [formerly 89def5cf03
[formerly e8e41630e8
] [formerly 6d610f8e8a
[formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 69ab975fab
[formerly 7bb37caa23
]
Former-commit-id: 190378beeb
2012-12-06 09:18:28 -06:00
Steve Harris
0b22b3c014
12.12.1-8 baseline
...
Former-commit-id: 2d338b4cec
[formerly 19962f41ba
] [formerly 2d338b4cec
[formerly 19962f41ba
] [formerly 5093a7c442
[formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: ff4131c2ee
[formerly ee06a94735
]
Former-commit-id: ec2cdc1593
2012-12-06 09:02:51 -06:00
Bryan Kowal
1e1e937a0f
Issue #1392 - update tar directory access paths for awips2-edex-native
...
Former-commit-id: 14555d54d8
[formerly 73e0f4b278
] [formerly 14555d54d8
[formerly 73e0f4b278
] [formerly 6ff82d812e
[formerly 65d91d9235a76c5ee82450d3dd6332f92e29c326]]]
Former-commit-id: 6ff82d812e
Former-commit-id: d7ce3f5840
[formerly 43f888ccb8
]
Former-commit-id: ced865ade3
2012-12-05 10:15:37 -06:00
Bryan Kowal
49f45e1901
Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features
...
Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf
Former-commit-id: 3a4ca9582d
[formerly d3b455c955
] [formerly 3a4ca9582d
[formerly d3b455c955
] [formerly f99d351995
[formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]]
Former-commit-id: f99d351995
Former-commit-id: ae64e9ce3b
[formerly b0c65323b6
]
Former-commit-id: 774d3a8f8d
2012-11-28 16:30:10 -06:00
Bryan Kowal
5ef1e97bdd
Issue #1318 - updated ncep database rpm specification file
...
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832
Former-commit-id: cbef9ad78d
[formerly b60dda550c
] [formerly cbef9ad78d
[formerly b60dda550c
] [formerly fe9dcaa216
[formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]]
Former-commit-id: fe9dcaa216
Former-commit-id: fe9a06b9b9
[formerly 67c3c140e3
]
Former-commit-id: dbe78374bc
2012-11-15 10:24:38 -06:00
Bryan Kowal
632e800a7e
Issue #1318 - updated ncep database rpm specification file
...
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9
Former-commit-id: 12667f6180
[formerly 99399e880e
] [formerly 12667f6180
[formerly 99399e880e
] [formerly 24074da383
[formerly f433daa8ffe59da91acba71ac5893d77ad810404]]]
Former-commit-id: 24074da383
Former-commit-id: 1842deff13
[formerly 3d123e08a7
]
Former-commit-id: 954534e3d0
2012-11-15 09:26:46 -06:00
Dustin Johnson
6d21c445c2
Merge branch 'ss_builds' (12.12.1-4) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: d27bce13c2
[formerly bff32bbe58
] [formerly d27bce13c2
[formerly bff32bbe58
] [formerly 0d1d663f41
[formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 5d5dbe27e1
[formerly e25b7c312b
]
Former-commit-id: ff33643234
2012-11-14 14:41:57 -06:00
Steve Harris
2c2bfc949d
12.12.1-4 baseline
...
Former-commit-id: b91b7f0fae
[formerly 85130eb611
] [formerly b91b7f0fae
[formerly 85130eb611
] [formerly 57578da521
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: e35a321a8c
[formerly 628ca9e5c6
]
Former-commit-id: 493f335c0b
2012-11-14 14:19:20 -06:00
Steve Harris
ae9d9985cd
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 8fc896f7d4
[formerly 448dd1c35f
] [formerly 8fc896f7d4
[formerly 448dd1c35f
] [formerly 00f3d51546
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719
[formerly c8cac52915
]
Former-commit-id: 59efd9a217
2012-11-13 17:28:50 -06:00
Steve Harris
53d74c66e7
12.12.1-2 baseline
...
Former-commit-id: ed809a02db
[formerly a8560580f8
] [formerly ed809a02db
[formerly a8560580f8
] [formerly 6868eb9b23
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf
[formerly df89fe9bed
]
Former-commit-id: 96a4a4f3f5
2012-11-13 17:14:24 -06:00
Steve Harris
af59663a99
12.12.1-1 baseline
...
Former-commit-id: c2839cc86d
[formerly e4bd20a515
] [formerly c2839cc86d
[formerly e4bd20a515
] [formerly e1498006c7
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928
[formerly 214fcd3b63
]
Former-commit-id: a5be98d6de
2012-11-07 12:41:20 -06:00
Dustin Johnson
931d94d1de
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 8e69107b5a
[formerly 98d7beae50
] [formerly 8e69107b5a
[formerly 98d7beae50
] [formerly 31d7d09c10
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a
[formerly bcf575966b
]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Steve Harris
6f16b46b8d
Merge branch 'ss_builds' into development
...
Former-commit-id: 340ce53e22
[formerly fb46bb053d
] [formerly 340ce53e22
[formerly fb46bb053d
] [formerly afb534db67
[formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]]
Former-commit-id: afb534db67
Former-commit-id: e211bfc043
[formerly 048c0c88cd
]
Former-commit-id: e9e3bdbec2
2012-10-29 12:17:12 -05:00
Steve Harris
a9e1b01ad7
12.11.1-12 baseline
...
Former-commit-id: 565756567f
[formerly 8682e4f6ca
] [formerly 565756567f
[formerly 8682e4f6ca
] [formerly 9ff9cb8aa3
[formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: d8b6157aab
[formerly 314c03e7b6
]
Former-commit-id: 09f6e43195
2012-10-29 12:15:56 -05:00
Steve Harris
8d94eb1e59
Merge branch 'ss_builds' (12.11.1-7) into development
...
Former-commit-id: d42e8373c6
[formerly b7406a55cc
] [formerly d42e8373c6
[formerly b7406a55cc
] [formerly 38b9c03f5e
[formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]]
Former-commit-id: 38b9c03f5e
Former-commit-id: ae9c6d58dd
[formerly 9d038186d1
]
Former-commit-id: 20e87549c0
2012-10-23 16:43:09 -05:00
Steve Harris
26badd258f
12.11.1-7 baseline
...
Former-commit-id: 40a5bc1683
[formerly d8ca6b9005
] [formerly 40a5bc1683
[formerly d8ca6b9005
] [formerly 79a5638de9
[formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]
Former-commit-id: 79a5638de9
Former-commit-id: efba080b9c
[formerly cfd228f0d7
]
Former-commit-id: 572085c119
2012-10-23 16:40:50 -05:00
Steve Harris
35c2a8e26f
Merge branch 'ss_builds' (12.11.1-6) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 3eff876edd
[formerly a7337d9160
] [formerly 3eff876edd
[formerly a7337d9160
] [formerly 1807100932
[formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: 8486da2fd3
[formerly 892e4df811
]
Former-commit-id: 8a17564ba3
2012-10-18 16:01:05 -05:00
Steve Harris
9c597c7060
12.11.1-6 baseline
...
Former-commit-id: 30c786a885
[formerly fba4a443a0
] [formerly 30c786a885
[formerly fba4a443a0
] [formerly 5c1f3cdc46
[formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8
[formerly 08fc9f6b14
]
Former-commit-id: 4f27cbb406
2012-10-18 15:53:01 -05:00
Steve Harris
13cdd55545
12.11.1-5 baseline
...
Former-commit-id: 362d6ffaca
[formerly 03f3f3c36a
] [formerly 362d6ffaca
[formerly 03f3f3c36a
] [formerly a0eaf651ff
[formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 85ad066b70
[formerly e31c1e5bba
]
Former-commit-id: dff8d5de9c
2012-10-18 15:46:42 -05:00
Richard Peter
1f5b91885d
Merge "Issue #1265 remove pypies gzip handling" into development
...
Former-commit-id: 935ddb3224
[formerly 3723250e50
] [formerly 935ddb3224
[formerly 3723250e50
] [formerly cd9306a537
[formerly fd47306a1247721d53b227bf94cc94818b4efc39]]]
Former-commit-id: cd9306a537
Former-commit-id: aa26b2a623
[formerly c7894c5cda
]
Former-commit-id: 88b80f406d
2012-10-17 14:07:28 -05:00