Steve Harris
|
f5f59b6aa5
|
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: 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]
Former-commit-id: 3827a78a7b
|
2012-09-25 10:31:57 -05:00 |
|
Steve Harris
|
5d5a61bd75
|
12.10.1-6 baseline
Former-commit-id: cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]
Former-commit-id: ba648f8e72
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
53673f63e6
|
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: 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]
Former-commit-id: 04d9735c8f
|
2012-09-13 13:26:13 -05:00 |
|
Steve Harris
|
2ba58a3576
|
12.10.1-4 baseline
Former-commit-id: fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]
Former-commit-id: 49c3861597
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
438d139fdd
|
12.10.1-3 baseline
Former-commit-id: 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 969e7e6dfd
|
2012-09-11 16:00:38 -05:00 |
|
Greg Armendariz
|
338f0ebd91
|
Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 8201f5346f [formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]
Former-commit-id: 58b74d05e5
|
2012-09-06 13:50:36 -05:00 |
|
Steve Harris
|
b9317a53c7
|
Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: 7d7f20b388 [formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]
Former-commit-id: 259bb4dfed
|
2012-09-06 11:09:24 -05:00 |
|
James Korman
|
f36d089fd5
|
Issue #1090 - pattern corrections
Former-commit-id: be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]
Former-commit-id: eb17151f74
|
2012-09-06 09:20:03 -05:00 |
|
Bryan Kowal
|
a34225c4c9
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]
Former-commit-id: 3e1556a981
|
2012-09-05 14:44:36 -05:00 |
|
Steve Harris
|
53e29f59e4
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]
Former-commit-id: af106f1d29
|
2012-09-04 12:11:03 -05:00 |
|
Steve Harris
|
7bd9c63dc7
|
12.10.1-1 baseline
Former-commit-id: 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: d708932029
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
9311c1737e
|
12.9.1-12 baseline
Former-commit-id: 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]
Former-commit-id: 150bc967a5
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
3230e0b246
|
Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]
Former-commit-id: 34cbde4124
|
2012-08-30 14:40:34 -05:00 |
|
Steve Harris
|
dc08c5a71a
|
12.9.1-10 baseline
Former-commit-id: 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: cb9b80f3a0
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
77369f78a6
|
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: d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]
Former-commit-id: 44a7cb75e7
|
2012-08-21 16:17:58 -05:00 |
|
Steve Harris
|
72824561cb
|
12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: f2fac39428
|
2012-08-21 15:27:03 -05:00 |
|
Bryan Kowal
|
69a16eb369
|
Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: 44328f1702 [formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]
Former-commit-id: 01e7976a52
|
2012-08-16 14:27:11 -05:00 |
|
root
|
8a66b2f209
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]
Former-commit-id: 5a453ee984
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
9990bf909b
|
12.9.1-4 baseline
Former-commit-id: dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]
Former-commit-id: 33b95fb96d
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
edbbacfa8a
|
12.9.1-3 baseline
Former-commit-id: 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]
Former-commit-id: 84bbf2573e
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
0c5d9e2416
|
12.9.1-1 baseline
Former-commit-id: 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 79ce6cfd97
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
b2432e096f
|
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]
Former-commit-id: 85f82b18b3
|
2012-08-06 09:38:26 -05:00 |
|
Steve Harris
|
d5563fc340
|
12.8.1-10 baseline
Former-commit-id: b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]
Former-commit-id: ca25d508ec
|
2012-08-06 09:34:26 -05:00 |
|
Steve Harris
|
8f4ddad22c
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]
Former-commit-id: a1071e3204
|
2012-08-06 08:23:04 -05:00 |
|
Bryan Kowal
|
a70bbf3e4d
|
Issue #997 - the scripted CAVE pde build will now only default to /opt/uframe-eclipse if the user has not specified an alternate eclipse location.
Change-Id: Ib9b5bbd3f89b0a241c7eb1865895e232ac8d85f7
Former-commit-id: e371bd14dd [formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]
Former-commit-id: 08651d2c21
|
2012-08-02 16:13:58 -05:00 |
|
Steve Harris
|
3476fe755b
|
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]
Former-commit-id: 51e38ca887
|
2012-08-01 12:43:12 -05:00 |
|
Bryan Kowal
|
024a23e7a3
|
Issue #970 - ensure that g2int has the same definition throughout grib2 and all dependencies; updated variable types based on function signatures.
Change-Id: If25d724c18ff5a9d09f94d77304ec729866158e6
Former-commit-id: 485334331a [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]
Former-commit-id: d07281ac51
|
2012-08-01 11:50:24 -05:00 |
|
Steve Harris
|
e0c3722fd1
|
12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: cd49ef3eda
|
2012-08-01 10:45:37 -05:00 |
|
Bryan Kowal
|
9fe0b6a424
|
Issue #969 - the top-level directory structure of i386-pc-linux-gnu.tar has slightly changed?
Change-Id: I29cae68e2d87ea8ff078d6ac56211da548e7074f
Former-commit-id: c74e48e4a4 [formerly 1b7f01a2e8afdf900dae4b124c7b17b91ac68f3d]
Former-commit-id: aa5b16537f
|
2012-07-29 09:40:01 -05:00 |
|
Bryan Kowal
|
107831f23d
|
Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6
Former-commit-id: 327ffa9439 [formerly dca54e56436ace397c6163b03ac4edb480336404]
Former-commit-id: cd40d9accf
|
2012-07-28 08:52:36 -05:00 |
|
Steve Harris
|
b82d6772c3
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: de9034c96c [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]
Former-commit-id: 4688ac304f
|
2012-07-27 14:50:45 -05:00 |
|
Steve Harris
|
2aa4114e4d
|
Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
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/FFMPColorUtils.java
cave/com.raytheon.uf.viz.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
edexOsgi/com.raytheon.uf.edex.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]
Former-commit-id: 587bb6a274
|
2012-07-27 14:44:44 -05:00 |
|
Bryan Kowal
|
74e2382060
|
Issue #964 - the awips2-edex-shapfiles rpm version can now be set dynamically.
Change-Id: I318c62ae1cae26600b5d024bca6c72ae8baed269
Former-commit-id: 7b44eaafe7 [formerly e47b171ad3863d4066dc2f00e509a8114f9f33f5]
Former-commit-id: b30c43883d
|
2012-07-26 13:47:25 -05:00 |
|
Bryan Kowal
|
8b44fbfb4f
|
Issue #959 - fix for manual command-line executions of the full rpm build.
Change-Id: Ic2ae5a0aea4983b6ed22ddeb4fd774f9b537214d
Former-commit-id: e31fd00613 [formerly b66b6fd7498e441290772be4b6906e58ac385511]
Former-commit-id: 2011493fda
|
2012-07-25 14:13:35 -05:00 |
|
Bryan Kowal
|
efefe956d2
|
Issue #768 - scripts no longer need to be executable.
Change-Id: I92c1d419c8ed73b954c1c96693d11b2f27313b83
Former-commit-id: fe4a515422 [formerly 535dfb1c7242763e67baa3130fc3a98477ccbc8b]
Former-commit-id: 88fdb461ea
|
2012-07-24 10:12:33 -05:00 |
|
Steve Harris
|
9f97182964
|
12.7.1-8 baseline
Former-commit-id: 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: c42ae0fa39
|
2012-07-19 16:20:40 -05:00 |
|
Bryan Kowal
|
56a2fa4068
|
Issue #760 - upgraded the lapack library.
Change-Id: I4a6481514b407cd7e1719d94e4086b1051b3090e
Former-commit-id: 10cde34ffe [formerly 47b881f604fec3591827f66481ff820032278aa0]
Former-commit-id: 95d0565b6d
|
2012-07-19 11:05:13 -05:00 |
|
Bryan Kowal
|
30e2defaf8
|
Issue #913 - fix the correct RadarServer start-config file.
Former-commit-id: 1e13956bce [formerly 10a2b1626a9388c1bf4244142fedd49d5b1d1d39]
Former-commit-id: 132870666a
|
2012-07-19 09:31:34 -05:00 |
|
Bryan Kowal
|
d908d0add3
|
Issue #913 - fixed the paths for Radar Server.
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208
Former-commit-id: 0ecf2f92c1 [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]
Former-commit-id: 7524f8ad8d
|
2012-07-18 11:12:09 -05:00 |
|
Bryan Kowal
|
90e005eec4
|
Issue #889 - specified the full path to awips2-ant.
Former-commit-id: c32bb9556e [formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]
Former-commit-id: 41bb75fa61
|
2012-07-14 08:51:00 -05:00 |
|
Bryan Kowal
|
46198b0c92
|
Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]
Former-commit-id: 1e5b71ee7b
|
2012-07-12 12:58:40 -05:00 |
|
Bryan Kowal
|
424bbaf0f7
|
Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]
Former-commit-id: 3b7c761f99
|
2012-07-11 12:44:32 -05:00 |
|
Bryan Kowal
|
7ace6b7acb
|
Issue #777 - removing the few remaining references to the WORKSPACE_DIR environment variable and the Installer.rpm directory. Ensure that
the build builds awips2-data.gfe.
Former-commit-id: b79f5a3c2b [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]
Former-commit-id: c7a172f97a
|
2012-07-11 09:42:46 -05:00 |
|
Bryan Kowal
|
580172b47c
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: f92eb59a73
|
2012-07-10 16:57:16 -05:00 |
|
Steve Harris
|
4f7bb90bb0
|
12.6.1-9 baseline
Former-commit-id: 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 27afa60345
|
2012-07-10 07:53:49 -05:00 |
|
Bryan Kowal
|
9a7d0492fe
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: b87b66abc5
|
2012-06-27 17:21:48 -05:00 |
|
Bryan Kowal
|
251b5fd79e
|
Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
Former-commit-id: 003c669ae5 [formerly f9e2b3f0aa74e32b1ba7518db738ce3b81d3cded]
Former-commit-id: 022777b7ec
|
2012-06-21 09:54:25 -05:00 |
|
Steve Harris
|
eacd5aeb7f
|
12.6.1-10 baseline
Former-commit-id: 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]
Former-commit-id: 3cd0902b49
|
2012-06-21 08:58:00 -05:00 |
|
Steve Harris
|
8367fb50f5
|
Revert "12.6.1-10 baseline"
This reverts commit b33c5bdfcf [formerly a2c0893d1a] [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].
Former-commit-id: b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: 25198a5cd6
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
b33c5bdfcf
|
12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: a2c0893d1a
|
2012-06-21 08:38:48 -05:00 |
|