Steve Harris
|
12c59e82df
|
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 bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9d1f595fe6 [formerly e23b030dfd] [formerly 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]]
Former-commit-id: bd0ee0b429fad620ecf3eac1dfa68366ef64350e [formerly f80fb62837]
Former-commit-id: 30b0700044
|
2012-09-13 13:26:13 -05:00 |
|
Steve Harris
|
ed04125cd7
|
12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
9d4e230e7a
|
12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
|
2012-09-11 16:00:38 -05:00 |
|
James Korman
|
0db16cedf0
|
Issue #1090 - pattern corrections
Former-commit-id: 5b2c527640 [formerly 78c7ce88ac] [formerly be350dd763] [formerly 5b2c527640 [formerly 78c7ce88ac] [formerly be350dd763] [formerly eb17151f74 [formerly be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]]]
Former-commit-id: eb17151f74
Former-commit-id: 77a4167bbe [formerly 85191cde31] [formerly 93eba3c470d03a96ea25c31692b39898165ffeb5 [formerly f36d089fd5]]
Former-commit-id: be4935f80f0e4b89c640f5626bbad1c47e7fcda8 [formerly 4b3126493d]
Former-commit-id: f07942db71
|
2012-09-06 09:20:03 -05:00 |
|
Bryan Kowal
|
1c396e356a
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 8444e742df [formerly 35aff16e89] [formerly 137b27d3ff] [formerly 8444e742df [formerly 35aff16e89] [formerly 137b27d3ff] [formerly 3e1556a981 [formerly 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]]]
Former-commit-id: 3e1556a981
Former-commit-id: a10099b0a4 [formerly 7ec6eb66ab] [formerly be92c88a0768d80b1afd3036de3111dbf50f3e10 [formerly a34225c4c9]]
Former-commit-id: aa15d0828c9d4b5dd037df90f420ad52b09ff334 [formerly 6494e3e627]
Former-commit-id: cc0821e0b0
|
2012-09-05 14:44:36 -05:00 |
|
Steve Harris
|
e4a69a14b7
|
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 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]]
Former-commit-id: 34cbde4124
Former-commit-id: a3a1864f56 [formerly ffe253196a] [formerly b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]]
Former-commit-id: 0a6beb81edff0c6c84ef952189b7118ada94cdbd [formerly 5b4ee818b7]
Former-commit-id: b63855f152
|
2012-08-30 14:40:34 -05:00 |
|
Steve Harris
|
cba4faf995
|
12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769 [formerly f43a5af47f] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c]
Former-commit-id: ede38c4b3f
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
598fdb5d07
|
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 57c1be9f5a [formerly 084ac9fbd4] [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: a6797a478a [formerly b335416e06] [formerly 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6]]
Former-commit-id: 7d1b3c075694ece999044bcdceef8462a2a837fe [formerly 445d1a6a0d]
Former-commit-id: 85533bdd24
|
2012-08-21 16:17:58 -05:00 |
|
Steve Harris
|
98059f9ef1
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
|
2012-08-21 15:27:03 -05:00 |
|
root
|
73466bae44
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
d7acb65c06
|
12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 988563a4b6 [formerly a535b51eba] [formerly 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a]]
Former-commit-id: 60681d51155fd0d8fea0ced04f4dc5174712adca [formerly 8c5c5ad6eb]
Former-commit-id: 03bb51ed0e
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
31353e2296
|
12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
dd62566e7c
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]]
Former-commit-id: a1071e3204
Former-commit-id: 9cce94e63a [formerly dbe07ca70c] [formerly c8ede12f88d71b1fa54dc220cc2b1866cb44d9e8 [formerly 8f4ddad22c]]
Former-commit-id: a822a26595a3bbeeeebb85b374d317db53bd3919 [formerly d507458b9b]
Former-commit-id: b62ac9c78e
|
2012-08-06 08:23:04 -05:00 |
|
Steve Harris
|
5d5bcddfd2
|
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: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]]
Former-commit-id: 51e38ca887
Former-commit-id: 330c7a877c [formerly d2291ba23f] [formerly 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]]
Former-commit-id: 398f1f615222e7408fca287d0787208690bcb094 [formerly e892eb4628]
Former-commit-id: 078b4fff3c
|
2012-08-01 12:43:12 -05:00 |
|
Bryan Kowal
|
9efdd07113
|
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: dd451f392f [formerly 6126e4316a] [formerly 485334331a] [formerly dd451f392f [formerly 6126e4316a] [formerly 485334331a] [formerly d07281ac51 [formerly 485334331a [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]]]
Former-commit-id: d07281ac51
Former-commit-id: 17a9da0402 [formerly 5b7330ca01] [formerly f8fef4627ebba88a297740ab1ae189fd855e752d [formerly 024a23e7a3]]
Former-commit-id: ab3c3d4e8f7ff971ad7a7ca76479b8d4e082ce15 [formerly 692e1d539a]
Former-commit-id: 2c7a012129
|
2012-08-01 11:50:24 -05:00 |
|
Steve Harris
|
1098368e19
|
12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3]
Former-commit-id: d3be09bd74
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
2e4db7ecaf
|
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: 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]]
Former-commit-id: 587bb6a274
Former-commit-id: c18e221e26 [formerly 9e4df42326] [formerly a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d]]
Former-commit-id: b31a14d116ecfb9ad88c58315c24f622ad7bf245 [formerly d7540c958f]
Former-commit-id: 84d0f1fbb6
|
2012-07-27 14:44:44 -05:00 |
|
Steve Harris
|
23dc8deeb0
|
12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9]
Former-commit-id: 36e2ad3023
|
2012-07-19 16:20:40 -05:00 |
|
Bryan Kowal
|
8b866abae6
|
Issue #760 - upgraded the lapack library.
Change-Id: I4a6481514b407cd7e1719d94e4086b1051b3090e
Former-commit-id: 54ed0e824b [formerly 6a6dc780bc] [formerly 10cde34ffe] [formerly 54ed0e824b [formerly 6a6dc780bc] [formerly 10cde34ffe] [formerly 95d0565b6d [formerly 10cde34ffe [formerly 47b881f604fec3591827f66481ff820032278aa0]]]]
Former-commit-id: 95d0565b6d
Former-commit-id: bb8b3478d8 [formerly 101c1f46fb] [formerly 9f279de0731a04f2f1f720db32d869b4fcc31a9c [formerly 56a2fa4068]]
Former-commit-id: f31d66cbb349938a9c238f00ccc8e13280ddac92 [formerly f82e477bd1]
Former-commit-id: 24262143dc
|
2012-07-19 11:05:13 -05:00 |
|
Bryan Kowal
|
457259d95e
|
Issue #913 - fix the correct RadarServer start-config file.
Former-commit-id: 6f119cdb8a [formerly 0651a04d0e] [formerly 1e13956bce] [formerly 6f119cdb8a [formerly 0651a04d0e] [formerly 1e13956bce] [formerly 132870666a [formerly 1e13956bce [formerly 10a2b1626a9388c1bf4244142fedd49d5b1d1d39]]]]
Former-commit-id: 132870666a
Former-commit-id: ec8bfc57b9 [formerly f9bfa30a32] [formerly 3d9dea96dc898463aa692086d87dce68f2398ab6 [formerly 30e2defaf8]]
Former-commit-id: 18d37fbe8f1a8768146caeea8140a1f7b6072d80 [formerly 852d1f2b8b]
Former-commit-id: 5286a4fbcd
|
2012-07-19 09:31:34 -05:00 |
|
Bryan Kowal
|
1bf8b23695
|
Issue #913 - fixed the paths for Radar Server.
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208
Former-commit-id: 642bd6d582 [formerly 2670a3d7b3] [formerly 0ecf2f92c1] [formerly 642bd6d582 [formerly 2670a3d7b3] [formerly 0ecf2f92c1] [formerly 7524f8ad8d [formerly 0ecf2f92c1 [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]]]]
Former-commit-id: 7524f8ad8d
Former-commit-id: 7ea050461f [formerly 250a553c35] [formerly b3228eeb2c91e6611c30b71f1855b6bc7d7f3b41 [formerly d908d0add3]]
Former-commit-id: fa04d8a895ea5303fcd460ab7b1e8250d9aaea51 [formerly 7ad3a9f249]
Former-commit-id: 990f5558da
|
2012-07-18 11:12:09 -05:00 |
|
Bryan Kowal
|
65c619ab09
|
Issue #889 - specified the full path to awips2-ant.
Former-commit-id: 0b49b7db45 [formerly a56cc7060b] [formerly c32bb9556e] [formerly 0b49b7db45 [formerly a56cc7060b] [formerly c32bb9556e] [formerly 41bb75fa61 [formerly c32bb9556e [formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]]]]
Former-commit-id: 41bb75fa61
Former-commit-id: 545668d74c [formerly d84d08c641] [formerly e11bcd965969002fda6342c5478bbd8834a3cd86 [formerly 90e005eec4]]
Former-commit-id: e6acabe72d33a1d6a6d4182cddc780affab378b6 [formerly 22555d73c1]
Former-commit-id: df3ee1a8f3
|
2012-07-14 08:51:00 -05:00 |
|
Bryan Kowal
|
80875985e1
|
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: 81dd57d347 [formerly b446253674] [formerly db6b535eb6] [formerly 81dd57d347 [formerly b446253674] [formerly db6b535eb6] [formerly 1e5b71ee7b [formerly db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: 302e87f975 [formerly 34a4f58074] [formerly b71427b1b065dcf68000893375f8b019e4a32137 [formerly 46198b0c92]]
Former-commit-id: 6d4f722b2ceb4bc80697f4f3dc2b3ebe3a204d0a [formerly de1d59a174]
Former-commit-id: fee2a4e419
|
2012-07-12 12:58:40 -05:00 |
|
Bryan Kowal
|
aa6196fcc5
|
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: 85dab34a39 [formerly 0e279845ba] [formerly b79f5a3c2b] [formerly 85dab34a39 [formerly 0e279845ba] [formerly b79f5a3c2b] [formerly c7a172f97a [formerly b79f5a3c2b [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]]]]
Former-commit-id: c7a172f97a
Former-commit-id: 38f5b0d3b8 [formerly 8aea713004] [formerly 14635ee7a33af24a843b10200822f7105e7b3f28 [formerly 7ace6b7acb]]
Former-commit-id: 9802908fb51bdb1d2062e947557d67175edcdaaf [formerly 8d6415ee35]
Former-commit-id: e500a413ba
|
2012-07-11 09:42:46 -05:00 |
|
Bryan Kowal
|
c152d7678f
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]]
Former-commit-id: f92eb59a73
Former-commit-id: 76ee9afb3f [formerly 8d64fdba2c] [formerly 52cad006ad06844a2b34006f7defa2ec2dc2d67f [formerly 580172b47c]]
Former-commit-id: 3ef9b4970b7c7eec89ff3c64f7174952b28b4ded [formerly 212afcceea]
Former-commit-id: 5b4c392e7f
|
2012-07-10 16:57:16 -05:00 |
|
Steve Harris
|
c74431ba29
|
12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
|
2012-07-10 07:53:49 -05:00 |
|
Bryan Kowal
|
e05b247e3b
|
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: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
|
2012-06-27 17:21:48 -05:00 |
|
Bryan Kowal
|
b28d23c4b0
|
Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
Former-commit-id: b382ae8a1e [formerly dd0936cfd9] [formerly 003c669ae5] [formerly b382ae8a1e [formerly dd0936cfd9] [formerly 003c669ae5] [formerly 022777b7ec [formerly 003c669ae5 [formerly f9e2b3f0aa74e32b1ba7518db738ce3b81d3cded]]]]
Former-commit-id: 022777b7ec
Former-commit-id: 4afd1372b9 [formerly 4ac49d172d] [formerly 5ce62d298f8853c96c50a381a4dedf1071c7aede [formerly 251b5fd79e]]
Former-commit-id: d016f2143a5ec65c788fc9832afa781553aac5be [formerly 3a21d467e2]
Former-commit-id: e12877f829
|
2012-06-21 09:54:25 -05:00 |
|
Steve Harris
|
8080ea523b
|
12.6.1-10 baseline
Former-commit-id: a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 7550311ef6 [formerly efe25edfad] [formerly 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f]]
Former-commit-id: 032c121c88e37cbeafabb63e30162517b2659626 [formerly df59dc7c44]
Former-commit-id: 56f8cf00a8
|
2012-06-21 08:58:00 -05:00 |
|
Steve Harris
|
c7356570ae
|
Revert "12.6.1-10 baseline"
This reverts commit 8d09188a88 [formerly 95e7f4fc0c] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]] [formerly 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].
Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4 [formerly 333fd9c64e] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418]
Former-commit-id: e77a15c047
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
8d09188a88
|
12.6.1-10 baseline
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]
Former-commit-id: 95e7f4fc0c
|
2012-06-21 08:38:48 -05:00 |
|
Bryan Kowal
|
41916b3e01
|
Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: 37abb38f30 [formerly ad13e81ea6] [formerly d20417a793] [formerly 37abb38f30 [formerly ad13e81ea6] [formerly d20417a793] [formerly a828d869a0 [formerly d20417a793 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]]]
Former-commit-id: a828d869a0
Former-commit-id: fe2c592edc [formerly 7ac868e3c7] [formerly 0237c8d764ada3f7a1e6a9ba396990a9fd82cb43 [formerly 916ce42ff8]]
Former-commit-id: fe01b191ff5a0383a52b9187bf968513677b9762 [formerly 424121af9d]
Former-commit-id: 48d821f5f8
|
2012-06-20 14:47:19 -05:00 |
|
Bryan Kowal
|
14f81556c3
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0 [formerly 21e8618852] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b]
Former-commit-id: a6d1f97dec
|
2012-06-18 11:16:28 -05:00 |
|
Steve Harris
|
ec9204fa94
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f]
Former-commit-id: 70a928d039
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
883d66bc46
|
12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad]
Former-commit-id: 3b468d9f50
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
581546a5eb
|
12.6.1-3 baseline
Former-commit-id: bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04 [formerly 32c0464d79] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3]
Former-commit-id: 518fa79f7f
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
b54ad5af66
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48 [formerly 23c34c469a] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2]
Former-commit-id: c01b096242
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Bryan Kowal
|
344e7567ae
|
Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1
Former-commit-id: 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 0f0bab6e54 [formerly a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: 304ce341b8 [formerly b817484c67] [formerly 1d8ed9e871f8274a9db57fa6db67ccd77f68abfa [formerly 0211167d87]]
Former-commit-id: e6a8df53928cd8442f4e71b1f738aa3bf1de31b5 [formerly e7f2ec38b5]
Former-commit-id: e5fd40d59e
|
2012-05-24 16:51:35 -05:00 |
|
Steve Harris
|
e460104ec9
|
12.5.1-6 baseline
Former-commit-id: ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: bc695ee025 [formerly 4792884ab2] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]]
Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019]
Former-commit-id: 26ed02c3dc
|
2012-05-16 16:41:22 -05:00 |
|
Bryan Kowal
|
0b0d0fe3ab
|
Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished.
Former-commit-id: 35c8df1b0a [formerly 38f61f4a73] [formerly ea8bf623cf] [formerly 35c8df1b0a [formerly 38f61f4a73] [formerly ea8bf623cf] [formerly fbb694b48e [formerly ea8bf623cf [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]]]
Former-commit-id: fbb694b48e
Former-commit-id: c557f812ae [formerly cbe0691efd] [formerly 220b395157e5157821d8ab81715fe4b80ec576e2 [formerly f7cba22ee2]]
Former-commit-id: 4357a37d3bdaa0f9bdd1ae191f613d97876311b3 [formerly 7f6a6ff856]
Former-commit-id: 4f7aa56ad1
|
2012-05-10 09:24:56 -05:00 |
|
Steve Harris
|
2f6ae50479
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625 [formerly 53d2822329] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560]
Former-commit-id: d040b14742
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
c76fddc7e4
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c [formerly 9c9e01dbda] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640]
Former-commit-id: 1d2ad9224a
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
6715112613
|
12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]]
Former-commit-id: b36c69cc67
Former-commit-id: 8025cc609e [formerly f6300cd995] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]]
Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413]
Former-commit-id: ef49f63d8d
|
2012-05-03 19:17:13 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Bryan Kowal
|
af724d221a
|
Issue #453 - defined a new generic xmpp rpm specification that will currently be used to create the awips2-openfire rpm. Updated the soon-to-be deprecated nightly and release builds to build the new rpm.
Former-commit-id: e5c1761860 [formerly 51688bb591] [formerly fadb50446d] [formerly e5c1761860 [formerly 51688bb591] [formerly fadb50446d] [formerly 298ab2e057 [formerly fadb50446d [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]]]
Former-commit-id: 298ab2e057
Former-commit-id: 706deb7c81 [formerly fb02245232] [formerly c9ae7cff3acaca8aa2da593554b31f3a03757a19 [formerly 62e4e0bbea]]
Former-commit-id: 0a517de94bd683b763a00f53701f6f88f16d1af0 [formerly b00be4fdeb]
Former-commit-id: f6e4e22f23
|
2012-04-16 17:00:30 -05:00 |
|
Steve Harris
|
80108c0af9
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]]
Former-commit-id: fee53dea94
Former-commit-id: a4eb467a34 [formerly 51bb9ebb46] [formerly 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]]
Former-commit-id: 59dcab34a58796d3cbce15bcb83c58e6507ec39d [formerly 58cb18d860]
Former-commit-id: f51d290333
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
9340618732
|
12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
8850e44772
|
Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]]
Former-commit-id: a0abcf8120
Former-commit-id: 239813406d [formerly 65aa72fee7] [formerly 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]]
Former-commit-id: 5a694628c15cf0ff0b617182e7f4ca869e47cb8d [formerly 5a310acb18]
Former-commit-id: 0a7cb5fd7a
|
2012-03-29 10:03:05 -05:00 |
|