Steve Harris
|
7f13d82b95
|
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 772c4359da [formerly 51eb89eb2a ] [formerly 91e39617cb ] [formerly 772c4359da [formerly 51eb89eb2a ] [formerly 91e39617cb ] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]]
Former-commit-id: a71dac6cad
Former-commit-id: fd6e8d5b63 [formerly dbcb28ce77 ] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee ]]
Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d ]
Former-commit-id: 3f44e46a6f
|
2012-08-27 09:53:55 -05:00 |
|
Steve Harris
|
2a7a7bfe2b
|
Merge branch 'ss_builds' (12.9.1-5 forgotten bin files) into development_on_ss_builds
Conflicts:
edexOsgi/build.edex/esb/bin/linux-x86-64/wrapper
Former-commit-id: bdf8d89d33 [formerly fbe4210245 ] [formerly 13f70884f3 ] [formerly bdf8d89d33 [formerly fbe4210245 ] [formerly 13f70884f3 ] [formerly 9425f73c71 [formerly 13f70884f3 [formerly aa64613b0d04bca36310817989c79d12f0f107db]]]]
Former-commit-id: 9425f73c71
Former-commit-id: cef1cd081f [formerly 3e9ee884ab ] [formerly f6fea8385be99f0d8a7dfa5a524af6d134db5dc0 [formerly de16453f4f ]]
Former-commit-id: 5fb55cc355cf3a4d7f80e83f63c1bdbee59a4df8 [formerly 5656ac11a1 ]
Former-commit-id: 36d0af113d
|
2012-08-22 16:06:02 -05:00 |
|
Steve Harris
|
d5bb93d38f
|
12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e1cf4b0b9a [formerly 7a4f4ac493 ] [formerly b8ab6066f6 ] [formerly e1cf4b0b9a [formerly 7a4f4ac493 ] [formerly b8ab6066f6 ] [formerly b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]]
Former-commit-id: b77a4d40d7
Former-commit-id: fffd905412 [formerly 34fa4b5804 ] [formerly 49afa39c09674dd9b84bfb0d70e9a7be354e2f85 [formerly b2c0dd1abb ]]
Former-commit-id: f3c30482814339d1bee25e242cd37c19e921ea03 [formerly 8f1120f6d8 ]
Former-commit-id: d404638d82
|
2012-08-22 16:00:33 -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 |
|
Steve Harris
|
37d482bf23
|
Issue #989 - Adding markings to jasper
Former-commit-id: 63c4a840ad [formerly 5ce7935576 ] [formerly ccc150c980 ] [formerly 63c4a840ad [formerly 5ce7935576 ] [formerly ccc150c980 ] [formerly 9e8f59f31d [formerly ccc150c980 [formerly 306b93cb3b73ae963b5900c8200d29a659689a74]]]]
Former-commit-id: 9e8f59f31d
Former-commit-id: a432d3a698 [formerly a7266b63fc ] [formerly d2f6f22e548d976113736d69ce571161ca4a89d9 [formerly 15462e7a38 ]]
Former-commit-id: 8736b2e18c714aaf0d542d6477bab386c400437e [formerly 65b74111f1 ]
Former-commit-id: 1f8e7a08f0
|
2012-08-20 16:26:51 -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
|
7fc3ac7397
|
Merge branch 'merge_development' into development
Former-commit-id: 291a674e41 [formerly 226818bda5 ] [formerly 051a51b79c ] [formerly 291a674e41 [formerly 226818bda5 ] [formerly 051a51b79c ] [formerly b27994c9b1 [formerly 051a51b79c [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]]]
Former-commit-id: b27994c9b1
Former-commit-id: c8dd1f50e9 [formerly 541b59d060 ] [formerly c0a190ac0c964f309e33d6b6b28bdaa7c7fa56be [formerly fa5eb7a16a ]]
Former-commit-id: c21d3edb4bf2b603a9865dc0590527e7ebea54f7 [formerly a922be1a5d ]
Former-commit-id: e4a1ecfc18
|
2012-07-10 17:03:21 -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
|
461e720c3e
|
Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
These files have existing camel-cased equivalents and may not be needed.
Former-commit-id: a456af38fa [formerly 8fff0d7e53 ] [formerly 479ccdbed2 ] [formerly a456af38fa [formerly 8fff0d7e53 ] [formerly 479ccdbed2 ] [formerly 9454393d13 [formerly 479ccdbed2 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]]]
Former-commit-id: 9454393d13
Former-commit-id: 1e747f0a42 [formerly 45ac1d4d51 ] [formerly 7ed16a1e6561227172b77b9994e15bfb96164579 [formerly 330b9c3174 ]]
Former-commit-id: fd07c26e5ac59302fff491238a67bd3c1240158d [formerly 19475ea67b ]
Former-commit-id: 1d367f861a
|
2012-07-10 09:29:33 -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
|
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 |
|
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 |
|
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
|
ad3bb08978
|
12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726 ] [formerly 704b75e1a1 ] [formerly 931087306f [formerly 418489e726 ] [formerly 704b75e1a1 ] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]]
Former-commit-id: 01457fbbde
Former-commit-id: caab7c1fbb [formerly 97caaa0327 ] [formerly bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac ]]
Former-commit-id: 8277df75752720d65ab600e9a692b7a94f2111c5 [formerly 3ed3a665cb ]
Former-commit-id: f1eb6efb23
|
2012-04-24 15:38:29 -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 |
|
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 |
|
Bryan Kowal
|
3ceb2b3d98
|
Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
Former-commit-id: 75c8f18793 [formerly d4b76c1057 ] [formerly 4276fc2fe8 ] [formerly 75c8f18793 [formerly d4b76c1057 ] [formerly 4276fc2fe8 ] [formerly 9f1b7a613a [formerly 4276fc2fe8 [formerly 1ec51accade835c1133eac9222131f9186985053]]]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 2d6d83c3d8 [formerly 8a71854fe1 ] [formerly 25079234f2afb61c81441d4fa189a886bdbf5294 [formerly 38ccaf882b ]]
Former-commit-id: 4f7f773ad8b61332e18e2736ed81b17d4a07cf05 [formerly 2fefca4860 ]
Former-commit-id: 9db8b4f405
|
2012-02-17 11:09:13 -06:00 |
|
Steve Harris
|
f1abad69fd
|
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 6d3d1066eb [formerly 221a02882a ] [formerly b9f4780fcb ] [formerly 6d3d1066eb [formerly 221a02882a ] [formerly b9f4780fcb ] [formerly 23cc9689de [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]]
Former-commit-id: 23cc9689de
Former-commit-id: f3d32f34ce [formerly a85a777232 ] [formerly 601b02191762801f860cf28b52a200c6e003e7ea [formerly a2e3aabc60 ]]
Former-commit-id: 14ed1eaa2666eb1db1b97a732045d1fc5b864aba [formerly b2999a6d59 ]
Former-commit-id: 3598fb2fcd
|
2012-02-15 14:39:43 -06:00 |
|
Bryan Kowal
|
f4fb4ad7b9
|
Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
Former-commit-id: 7b5b643d18 [formerly 2fabaff1d9 ] [formerly 38eb4bd2b6 ] [formerly 7b5b643d18 [formerly 2fabaff1d9 ] [formerly 38eb4bd2b6 ] [formerly 521756e57e [formerly 38eb4bd2b6 [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]]]
Former-commit-id: 521756e57e
Former-commit-id: 83ba57dcd1 [formerly 134b8f2915 ] [formerly 66ae2354057f0c9b76ece5f6ef014f53d118b46b [formerly 1c023403e2 ]]
Former-commit-id: 588279ad4f4dbf9fd1f3f78ffb920ff7bc7e9ca6 [formerly e19d034858 ]
Former-commit-id: b59b0ef8d5
|
2012-02-15 10:31:58 -06:00 |
|
Ben Steffensmeier
|
be33534dea
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: 2edb2afe04 [formerly 808846e237 ] [formerly 944e59e989 ] [formerly 2edb2afe04 [formerly 808846e237 ] [formerly 944e59e989 ] [formerly f65d86a06a [formerly 944e59e989 [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]]]
Former-commit-id: f65d86a06a
Former-commit-id: 6212d0efc7 [formerly 993f2aafa4 ] [formerly 2203a419ff9c3a59fd6802a9ac886bf01d7ca8c3 [formerly d00572c122 ]]
Former-commit-id: 0c58fbd21f81bc1efc1a1672d07433fa637d3c8d [formerly 800e674078 ]
Former-commit-id: 16b7863b52
|
2012-02-14 15:46:11 -06:00 |
|
Bryan Kowal
|
4cd41c4137
|
Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
Former-commit-id: 02c48be369 [formerly c78e988d55 ] [formerly 67562b0674 ] [formerly 02c48be369 [formerly c78e988d55 ] [formerly 67562b0674 ] [formerly 4faf9831ed [formerly 67562b0674 [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]]]
Former-commit-id: 4faf9831ed
Former-commit-id: 2e2b3b4869 [formerly 0bf4fecb62 ] [formerly e75d6befa5289852fa8cf3ebd7ce2bc1848f4f41 [formerly eb91bb964e ]]
Former-commit-id: e2850a17d1b816139542eb5da9c6e23e34013580 [formerly 0978aa5d1d ]
Former-commit-id: 4ccdc365e1
|
2012-02-13 13:57:10 -06:00 |
|
Bryan Kowal
|
eebd1f6beb
|
Issue #197 - merging gridslice changes into git thinclient branch.
Former-commit-id: 79ac259d23 [formerly 3fecaf9a5a ] [formerly 710c7af072 ] [formerly 79ac259d23 [formerly 3fecaf9a5a ] [formerly 710c7af072 ] [formerly a48a3094f0 [formerly 710c7af072 [formerly ae1bd95af06f6413ff17b73b290fda3ab8a13b29]]]]
Former-commit-id: a48a3094f0
Former-commit-id: 49aa09a64e [formerly 1821f12dee ] [formerly 4aa5a8ae50eb5f7b9533fdcfb05d524989a9f2cd [formerly ebcff5bae9 ]]
Former-commit-id: 3a87986b4ac8387b405c9d0b5414187e72f6fc47 [formerly 2f03dada49 ]
Former-commit-id: ea781be82f
|
2012-01-23 13:40:59 -06:00 |
|
Bryan Kowal
|
819b77d5d0
|
Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: c1d930b119 [formerly be0b6a87eb ] [formerly 5039d66b12 ] [formerly c1d930b119 [formerly be0b6a87eb ] [formerly 5039d66b12 ] [formerly cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 3bc50618b7 [formerly f6b08149ad ] [formerly 04447b381e8f34176bf56aeac8375d7e5d6866ba [formerly 90c33ef882 ]]
Former-commit-id: 5deeaa5352ab19e9521a87ced725f98ed250df11 [formerly a5a50ccfe0 ]
Former-commit-id: f0cdfeb9a8
|
2012-01-23 13:25:11 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7 ] [formerly 66be3bec40 ] [formerly d8da2252c3 [formerly 580e2938d7 ] [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf ] [formerly 21d2361f00 [formerly 1faae42484 ]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59 ] [formerly 377dcd10b9 [formerly 3360eb6c5f ]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|