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
Nate Jensen
853d433117
Issue #1265 remove pypies gzip handling
...
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5
Former-commit-id: 7874be59e7
[formerly fa3e87549a
] [formerly 7874be59e7
[formerly fa3e87549a
] [formerly 2dac2f5dde
[formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]]
Former-commit-id: 2dac2f5dde
Former-commit-id: 9dac98930f
[formerly 740146d838
]
Former-commit-id: 60ad3b55f2
2012-10-17 11:32:49 -05:00
Steve Harris
b7a76beea6
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 4ffbffe349
[formerly a63b40b17a
] [formerly 4ffbffe349
[formerly a63b40b17a
] [formerly 5e5c98b193
[formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]]
Former-commit-id: 5e5c98b193
Former-commit-id: a3a79a1a82
[formerly be16909d2d
]
Former-commit-id: b28a8e5113
2012-10-16 21:44:49 -05:00
Steve Harris
1e4c737ff2
Merge branch 'ss_builds' (12.11.1-4) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
cave/com.raytheon.viz.gfe/help/localMapsConfig.html
cave/com.raytheon.viz.gfe/help/mapConfig.html
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
rpms/common/yum/arch.x86/comps.xml
Former-commit-id: da7a11fe97
[formerly 4610ecc513
] [formerly da7a11fe97
[formerly 4610ecc513
] [formerly 751563e331
[formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: d0e91329b4
[formerly 0c0c1144c6
]
Former-commit-id: ad78266035
2012-10-16 15:48:14 -05:00
Steve Harris
35e34308c5
12.11.1-4 baseline
...
Former-commit-id: 98171b5de9
[formerly d3497e47eb
] [formerly 98171b5de9
[formerly d3497e47eb
] [formerly 6958b861f0
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07
[formerly cbbdb231ce
]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00
Greg Armendariz
1b318ab0f6
Merge changes Ibe8b9a97,If48f637e into development
...
* changes:
Issue #1252 - Checked in wrong file. Deleting it. Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
Issue #1252 - Updated with changes from Dale Morris
Former-commit-id: 2d18d5791a
[formerly d1772b3705
] [formerly 2d18d5791a
[formerly d1772b3705
] [formerly b8de817d68
[formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]]
Former-commit-id: b8de817d68
Former-commit-id: 1c5bebe6a9
[formerly 2c058c6b8a
]
Former-commit-id: 041b833d53
2012-10-16 12:59:00 -05:00
Nate Jensen
1efcd36987
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
...
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: cbc2da0c06
[formerly f2cbf0c5c3
] [formerly cbc2da0c06
[formerly f2cbf0c5c3
] [formerly 8e4a7ec406
[formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 93143bbda0
[formerly 5bdf9d4d38
]
Former-commit-id: 319c4cda2b
2012-10-12 15:16:27 -05:00
James Korman
8074a49529
Issue #1252 - Checked in wrong file. Deleting it.
...
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
Former-commit-id: c2a4c48f5d
[formerly aca18f0a37
] [formerly c2a4c48f5d
[formerly aca18f0a37
] [formerly fd783767b2
[formerly a9e332dd585910aa6094d30c3e883451fb0df237]]]
Former-commit-id: fd783767b2
Former-commit-id: 83bd2e28c4
[formerly 31be9c204d
]
Former-commit-id: 5659c72222
2012-10-12 14:48:59 -05:00
James Korman
e41cb57aac
Issue #1252 - Updated with changes from Dale Morris
...
Former-commit-id: 6d5df727e5
[formerly 2fad414d6d
] [formerly 6d5df727e5
[formerly 2fad414d6d
] [formerly 20c61590a4
[formerly f48f637e60f7537da42681dc001332257a046d2b]]]
Former-commit-id: 20c61590a4
Former-commit-id: b306b6bd0a
[formerly 4ce298e736
]
Former-commit-id: add08a1c0d
2012-10-12 14:48:59 -05:00
Steve Harris
198eca2a6c
Merge branch 'ss_builds' (12.11.1-2) into development
...
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73
Former-commit-id: 7be572b27d
[formerly 8c97afe03b
] [formerly 7be572b27d
[formerly 8c97afe03b
] [formerly 0895f22690
[formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]
Former-commit-id: 0895f22690
Former-commit-id: 48a80a23e4
[formerly 8dae024430
]
Former-commit-id: 8c81601905
2012-10-08 13:29:34 -05:00
Steve Harris
ff9321e3ce
12.11.1-2 baseline
...
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 75901860c2
[formerly c12ee14e66
] [formerly 75901860c2
[formerly c12ee14e66
] [formerly 1e02387ff1
[formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 772c60efa4
[formerly 42bf60b2fc
]
Former-commit-id: e72b6d5da6
2012-10-08 13:26:20 -05:00
Steve Harris
d85a490f06
Issue #1250 - Modified the comp.xml files adding kml-export
...
Change-Id: I53bcbf3199013f02db1ea83c5e665912d6232761
Former-commit-id: 961e000592
[formerly d0c760764f
] [formerly 961e000592
[formerly d0c760764f
] [formerly 9552a60f54
[formerly 252fbc2ff9e34300c2176a6c149c3af9a523321c]]]
Former-commit-id: 9552a60f54
Former-commit-id: 324cc2ab58
[formerly a94cb4c7bd
]
Former-commit-id: 67c18fd17d
2012-10-05 10:06:16 -05:00
Steven Harris
2f855322f6
12.11.1-1 baseline
...
Former-commit-id: 0e86bfd1d3
[formerly 618aa3f316
] [formerly 0e86bfd1d3
[formerly 618aa3f316
] [formerly feec28f274
[formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93
[formerly 8843ffd022
]
Former-commit-id: a544be6d83
2012-09-27 15:57:45 -05:00
Steve Harris
94cb625e91
Merge branch 'ss_builds' (12.10.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
Former-commit-id: 686b1756c9
[formerly 8354ca4e68
] [formerly 686b1756c9
[formerly 8354ca4e68
] [formerly 3827a78a7b
[formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 8edfe17e7d
[formerly f5f59b6aa5
]
Former-commit-id: a20533b551
2012-09-25 10:31:57 -05:00
Steve Harris
20732fcbd5
12.10.1-6 baseline
...
Former-commit-id: 81d91a8289
[formerly cebe6534ae
] [formerly 81d91a8289
[formerly cebe6534ae
] [formerly ba648f8e72
[formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]
Former-commit-id: ba648f8e72
Former-commit-id: 0e77eb2fe2
[formerly 5d5a61bd75
]
Former-commit-id: e39023bb85
2012-09-25 10:14:23 -05:00
Steve Harris
30b0700044
Merge branch 'ss_builds' (12.10.1-4) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 04de1d5857
[formerly 29e7427dc3
] [formerly 04de1d5857
[formerly 29e7427dc3
] [formerly 04d9735c8f
[formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: e23b030dfd
[formerly 53673f63e6
]
Former-commit-id: f80fb62837
2012-09-13 13:26:13 -05:00
Steve Harris
e57e7237a9
12.10.1-4 baseline
...
Former-commit-id: e38e81ab8c
[formerly fd19ca5624
] [formerly e38e81ab8c
[formerly fd19ca5624
] [formerly 49c3861597
[formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5
[formerly 2ba58a3576
]
Former-commit-id: 26b7d083ec
2012-09-13 12:08:11 -05:00
Steve Harris
5030894212
12.10.1-3 baseline
...
Former-commit-id: de1639aea2
[formerly 21f430062b
] [formerly de1639aea2
[formerly 21f430062b
] [formerly 969e7e6dfd
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db
[formerly 438d139fdd
]
Former-commit-id: faadb51529
2012-09-11 16:00:38 -05:00
Greg Armendariz
2f1d6b3515
Merge "Issue #1090 - pattern corrections" into development
...
Former-commit-id: 3cc51587c6
[formerly 8201f5346f
] [formerly 3cc51587c6
[formerly 8201f5346f
] [formerly 58b74d05e5
[formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]]]
Former-commit-id: 58b74d05e5
Former-commit-id: e1851f370a
[formerly 338f0ebd91
]
Former-commit-id: 84b24812c2
2012-09-06 13:50:36 -05:00
Steve Harris
ef706c6dd5
Issue #1141 - Adding JavaAPIforKml license file
...
Former-commit-id: 262473a662
[formerly 7d7f20b388
] [formerly 262473a662
[formerly 7d7f20b388
] [formerly 259bb4dfed
[formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]]]
Former-commit-id: 259bb4dfed
Former-commit-id: 727899cc20
[formerly b9317a53c7
]
Former-commit-id: ab4d9d7b75
2012-09-06 11:09:24 -05:00
James Korman
f07942db71
Issue #1090 - pattern corrections
...
Former-commit-id: 78c7ce88ac
[formerly be350dd763
] [formerly 78c7ce88ac
[formerly be350dd763
] [formerly eb17151f74
[formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]]
Former-commit-id: eb17151f74
Former-commit-id: 85191cde31
[formerly f36d089fd5
]
Former-commit-id: 4b3126493d
2012-09-06 09:20:03 -05:00