Bryan Kowal
|
ddfb4e506c
|
Issue #1318 - updated ncep database rpm specification file
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832
Former-commit-id: b1b627e2c2 [formerly cbef9ad78d] [formerly b60dda550c] [formerly fe9dcaa216 [formerly b60dda550c [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]]
Former-commit-id: fe9dcaa216
Former-commit-id: 4eb2cd0ee8e37a25a3f86d7e56bcd8d29436927f [formerly 67c3c140e3]
Former-commit-id: fe9a06b9b9
|
2012-11-15 10:24:38 -06:00 |
|
Bryan Kowal
|
43764917d6
|
Issue #1318 - updated ncep database rpm specification file
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9
Former-commit-id: fec5563e49 [formerly 12667f6180] [formerly 99399e880e] [formerly 24074da383 [formerly 99399e880e [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]]
Former-commit-id: 24074da383
Former-commit-id: 6bb70694850931d2fdd0600e6b049709acb20cc6 [formerly 3d123e08a7]
Former-commit-id: 1842deff13
|
2012-11-15 09:26:46 -06:00 |
|
Dustin Johnson
|
08fd67e94a
|
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: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]
Former-commit-id: 5d5dbe27e1
|
2012-11-14 14:41:57 -06:00 |
|
Steve Harris
|
4300583fc2
|
12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]
Former-commit-id: e35a321a8c
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
98670f1cc2
|
Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]
Former-commit-id: 21ecd53719
|
2012-11-13 17:28:50 -06:00 |
|
Steve Harris
|
5365b72401
|
12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]
Former-commit-id: 111e7607cf
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
3cb24c1d06
|
12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
|
2012-11-07 12:41:20 -06:00 |
|
Dustin Johnson
|
fe8a2a3b09
|
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: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]
Former-commit-id: e7a0f96a9a
|
2012-11-01 13:36:06 -05:00 |
|
Steve Harris
|
0084fee62b
|
Merge branch 'ss_builds' into development
Former-commit-id: eb8a05a414 [formerly 340ce53e22] [formerly fb46bb053d] [formerly afb534db67 [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]]
Former-commit-id: afb534db67
Former-commit-id: cd588b3fe1018ebb8f94ece1f068009b87ded0d7 [formerly 048c0c88cd]
Former-commit-id: e211bfc043
|
2012-10-29 12:17:12 -05:00 |
|
Steve Harris
|
89940e8fed
|
12.11.1-12 baseline
Former-commit-id: 7f6baf2e24 [formerly 565756567f] [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 1acfe145013f9afdd8c598af509871593462a766 [formerly 314c03e7b6]
Former-commit-id: d8b6157aab
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
40de07be3a
|
Merge branch 'ss_builds' (12.11.1-7) into development
Former-commit-id: 3a9c6123d2 [formerly d42e8373c6] [formerly b7406a55cc] [formerly 38b9c03f5e [formerly b7406a55cc [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]]
Former-commit-id: 38b9c03f5e
Former-commit-id: 5b5bfa0479777257e48138e367f1e8be151aea45 [formerly 9d038186d1]
Former-commit-id: ae9c6d58dd
|
2012-10-23 16:43:09 -05:00 |
|
Steve Harris
|
320a29466d
|
12.11.1-7 baseline
Former-commit-id: 59e5b55b96 [formerly 40a5bc1683] [formerly d8ca6b9005] [formerly 79a5638de9 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]
Former-commit-id: 79a5638de9
Former-commit-id: 901f56658eaeddda857d877834f967b14c2f861c [formerly cfd228f0d7]
Former-commit-id: efba080b9c
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
81db247276
|
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: 95727755c7 [formerly 3eff876edd] [formerly 6118445ed7c2dbe29fc3fbd891afff9ce39d62fb [formerly a7337d9160]] [formerly 1807100932 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: a722324705ed3164c37a327413de2e52d14ffae3 [formerly 892e4df811]
Former-commit-id: 8486da2fd3
|
2012-10-18 16:01:05 -05:00 |
|
Steve Harris
|
ae73939b02
|
12.11.1-6 baseline
Former-commit-id: 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14]
Former-commit-id: 8beb6fc0b8
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
dfdf01de85
|
12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]
Former-commit-id: 85ad066b70
|
2012-10-18 15:46:42 -05:00 |
|
Richard Peter
|
afe520cfaa
|
Merge "Issue #1265 remove pypies gzip handling" into development
Former-commit-id: d0f2925f45 [formerly 935ddb3224] [formerly 3723250e50] [formerly cd9306a537 [formerly 3723250e50 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]]
Former-commit-id: cd9306a537
Former-commit-id: 35e5f6584a432fb89498c0f0d47d57ccd6381cb1 [formerly c7894c5cda]
Former-commit-id: aa26b2a623
|
2012-10-17 14:07:28 -05:00 |
|
Nate Jensen
|
5262954e46
|
Issue #1265 remove pypies gzip handling
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5
Former-commit-id: 4fc0bee363 [formerly 7874be59e7] [formerly fa3e87549a] [formerly 2dac2f5dde [formerly fa3e87549a [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]]
Former-commit-id: 2dac2f5dde
Former-commit-id: c7cef0967a0380bf57d4537db4b1d98a735241df [formerly 740146d838]
Former-commit-id: 9dac98930f
|
2012-10-17 11:32:49 -05:00 |
|
Steve Harris
|
002e4e0e8b
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 37ab3d9e65 [formerly 4ffbffe349] [formerly a63b40b17a] [formerly 5e5c98b193 [formerly a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]]
Former-commit-id: 5e5c98b193
Former-commit-id: 15bce86b4c6e1715fae59229b3f9e7dcc1cf5721 [formerly be16909d2d]
Former-commit-id: a3a79a1a82
|
2012-10-16 21:44:49 -05:00 |
|
Steve Harris
|
d88afce365
|
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: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]
Former-commit-id: d0e91329b4
|
2012-10-16 15:48:14 -05:00 |
|
Steve Harris
|
c9b563338a
|
12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
|
2012-10-16 13:27:07 -05:00 |
|
Greg Armendariz
|
6e831af9c3
|
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: 24cfef1397 [formerly 2d18d5791a] [formerly d1772b3705] [formerly b8de817d68 [formerly d1772b3705 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]]
Former-commit-id: b8de817d68
Former-commit-id: aeeec4969cf01c7fd65d843c6e49aac72bc82c8b [formerly 2c058c6b8a]
Former-commit-id: 1c5bebe6a9
|
2012-10-16 12:59:00 -05:00 |
|
Nate Jensen
|
446d7f5f13
|
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: c35558c0281157096518a8d9e3647aa801d78a21 [formerly 5bdf9d4d38]
Former-commit-id: 93143bbda0
|
2012-10-12 15:16:27 -05:00 |
|
James Korman
|
24267b6661
|
Issue #1252 - Checked in wrong file. Deleting it.
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
Former-commit-id: 3ce7b04eab [formerly c2a4c48f5d] [formerly aca18f0a37] [formerly fd783767b2 [formerly aca18f0a37 [formerly a9e332dd585910aa6094d30c3e883451fb0df237]]]
Former-commit-id: fd783767b2
Former-commit-id: 2f58ca4e29b7cc53c712e241e9b070c4f6a99bf1 [formerly 31be9c204d]
Former-commit-id: 83bd2e28c4
|
2012-10-12 14:48:59 -05:00 |
|
James Korman
|
ee79b6830c
|
Issue #1252 - Updated with changes from Dale Morris
Former-commit-id: 8d71a3dc92 [formerly 6d5df727e5] [formerly 2fad414d6d] [formerly 20c61590a4 [formerly 2fad414d6d [formerly f48f637e60f7537da42681dc001332257a046d2b]]]
Former-commit-id: 20c61590a4
Former-commit-id: cb2d57100027ea4633da455b3e456d1969e40798 [formerly 4ce298e736]
Former-commit-id: b306b6bd0a
|
2012-10-12 14:48:59 -05:00 |
|
Steve Harris
|
d6f07f7013
|
Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73
Former-commit-id: a6c3e16c69 [formerly 7be572b27d] [formerly 634c6bd63f9ed7885295630247765c53b3e97028 [formerly 8c97afe03b]] [formerly 0895f22690 [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]
Former-commit-id: 0895f22690
Former-commit-id: 0ccc977e5162ad8a17c1a30f58a15fa4f27ad13b [formerly 8dae024430]
Former-commit-id: 48a80a23e4
|
2012-10-08 13:29:34 -05:00 |
|
Steve Harris
|
6e0b2c55d7
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]
Former-commit-id: 772c60efa4
|
2012-10-08 13:26:20 -05:00 |
|
Steve Harris
|
a609d4f3fb
|
Issue #1250 - Modified the comp.xml files adding kml-export
Change-Id: I53bcbf3199013f02db1ea83c5e665912d6232761
Former-commit-id: fd922e4d77 [formerly 961e000592] [formerly d0c760764f] [formerly 9552a60f54 [formerly d0c760764f [formerly 252fbc2ff9e34300c2176a6c149c3af9a523321c]]]
Former-commit-id: 9552a60f54
Former-commit-id: 1fa9ac6ee713ff913a24c7e350e87be88927cc9c [formerly a94cb4c7bd]
Former-commit-id: 324cc2ab58
|
2012-10-05 10:06:16 -05:00 |
|
Steven Harris
|
9c67bbab77
|
12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]
Former-commit-id: f5e63d5f93
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
01f5a0b21a
|
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: 6cb180ff5b [formerly 686b1756c9] [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 194b5d78ca44a987232c43b536b8a7d0f46623ae [formerly f5f59b6aa5]
Former-commit-id: 8edfe17e7d
|
2012-09-25 10:31:57 -05:00 |
|
Steve Harris
|
d5ec4edea1
|
12.10.1-6 baseline
Former-commit-id: dd922048c0 [formerly 81d91a8289] [formerly ea3b8e2680937dc133fce53ac16b4f91b25d4bc7 [formerly cebe6534ae]] [formerly ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]
Former-commit-id: ba648f8e72
Former-commit-id: e2eff41ad429447d5c80be0157ac1ea818d306fa [formerly 5d5a61bd75]
Former-commit-id: 0e77eb2fe2
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
9d1f595fe6
|
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: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]
Former-commit-id: e23b030dfd
|
2012-09-13 13:26:13 -05:00 |
|
Steve Harris
|
424c32bd5d
|
12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]
Former-commit-id: 684feb34e5
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
64699fa90b
|
12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]
Former-commit-id: f376a4b4db
|
2012-09-11 16:00:38 -05:00 |
|
Greg Armendariz
|
2a1d21e17f
|
Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 572a83adb7 [formerly 3cc51587c6] [formerly 8201f5346f] [formerly 58b74d05e5 [formerly 8201f5346f [formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]]]
Former-commit-id: 58b74d05e5
Former-commit-id: 2f2f315c07c4f62a2d12dcf52754cec6dcca7ef5 [formerly 338f0ebd91]
Former-commit-id: e1851f370a
|
2012-09-06 13:50:36 -05:00 |
|
Steve Harris
|
e1fc93dfa6
|
Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: bff568429e [formerly 262473a662] [formerly 7d7f20b388] [formerly 259bb4dfed [formerly 7d7f20b388 [formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]]]
Former-commit-id: 259bb4dfed
Former-commit-id: b5f2c0d43419e070c4bba708a58e58d3d8d0517c [formerly b9317a53c7]
Former-commit-id: 727899cc20
|
2012-09-06 11:09:24 -05:00 |
|
James Korman
|
77a4167bbe
|
Issue #1090 - pattern corrections
Former-commit-id: 5b2c527640 [formerly 78c7ce88ac] [formerly be350dd763] [formerly eb17151f74 [formerly be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]]
Former-commit-id: eb17151f74
Former-commit-id: 93eba3c470d03a96ea25c31692b39898165ffeb5 [formerly f36d089fd5]
Former-commit-id: 85191cde31
|
2012-09-06 09:20:03 -05:00 |
|
Bryan Kowal
|
a10099b0a4
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 8444e742df [formerly 35aff16e89] [formerly 137b27d3ff] [formerly 3e1556a981 [formerly 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]]
Former-commit-id: 3e1556a981
Former-commit-id: be92c88a0768d80b1afd3036de3111dbf50f3e10 [formerly a34225c4c9]
Former-commit-id: 7ec6eb66ab
|
2012-09-05 14:44:36 -05:00 |
|
Steve Harris
|
20e088a957
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]
Former-commit-id: f224e3e8ad
|
2012-09-04 12:11:03 -05:00 |
|
Steve Harris
|
9f4fa7bf83
|
12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
15fa63819d
|
12.9.1-12 baseline
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]
Former-commit-id: 782941ccc1
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
a3a1864f56
|
Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]
Former-commit-id: ffe253196a
|
2012-08-30 14:40:34 -05:00 |
|
Steve Harris
|
c704490769
|
12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]
Former-commit-id: f43a5af47f
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
a6797a478a
|
Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
Conflicts:
cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
nativeLib/rary.cots.jasper/jasper-1.900.1/configure
rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/i386/build.sh
tools/scripts/commit-msg
tools/scripts/git-u-setup
tools/scripts/uamend
tools/scripts/ucommit
tools/scripts/upull
tools/scripts/upush
tools/scripts/ustat
Former-commit-id: 57c1be9f5a [formerly 084ac9fbd4] [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6]
Former-commit-id: b335416e06
|
2012-08-21 16:17:58 -05:00 |
|
Steve Harris
|
d9faed979f
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
|
2012-08-21 15:27:03 -05:00 |
|
Bryan Kowal
|
3e500e71a6
|
Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: 31ec3cbee0 [formerly d5c16eb8ce] [formerly 44328f1702] [formerly 01e7976a52 [formerly 44328f1702 [formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]]
Former-commit-id: 01e7976a52
Former-commit-id: f928d8f3a6488da251855ae1cb97a15af51db335 [formerly 69a16eb369]
Former-commit-id: f81ba4737c
|
2012-08-16 14:27:11 -05:00 |
|
root
|
791f3f5b85
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]
Former-commit-id: 537dbadf64
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
80655bf0a3
|
12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]
Former-commit-id: d7d60cc623
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
988563a4b6
|
12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a]
Former-commit-id: a535b51eba
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
d3023f15ac
|
12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]
Former-commit-id: aed7a644df
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
4f1a7eb689
|
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: 7b6c223552 [formerly 9e2d161f8d] [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: ee22b108589d0c82dcd1216d6f772ca807503da2 [formerly b2432e096f]
Former-commit-id: 52e0da2293
|
2012-08-06 09:38:26 -05:00 |
|