Ana Rivera
|
0aaba96d2e
|
Merge branch 'master_16.1.1'(OB_16.1.1-2) into field_16.1.1
Change-Id: Icbd151fa26f70df56667c200852be0fabe8462d3
Former-commit-id: 44193d6ac1d120c797d8ce6641c03baef9816ca7
|
2015-08-04 12:56:53 +00:00 |
|
Steve Harris
|
f696d5731d
|
Merge tag 'OB_16.1.1-2' into omaha_16.2.1
16.1.1-2
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
Former-commit-id: 8053621c46adc8813128ecfa81c0834f670db64f
|
2015-08-03 17:06:31 -05:00 |
|
Fay.Liang
|
5c5bc3a5b5
|
Merge branch 'field_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: 061ce49506ae6b538dad609a3be711aec3efae80
|
2015-07-31 16:53:30 -04:00 |
|
David Friedman
|
4bdfeb8da8
|
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
|
2015-07-30 20:53:19 +00:00 |
|
David Lovely
|
a09a6855ba
|
Omaha #4574 Upgrade Python to 2.7.10
Former-commit-id: 10363dc8f481376625a6f7e6ecfa11dec03d2278
|
2015-07-29 09:11:57 -05:00 |
|
Ron Anderson
|
f718548265
|
Omaha #4521 Update matplotlib to 1.4.3. Add new unpackaged dependencies.
Change-Id: I956998b38b039baf9fcb701b7d4b4f72035126c8
Former-commit-id: 01ade2e0ffbf9ff67932478fcb4e0f6488d283e4
|
2015-07-23 13:05:56 -05:00 |
|
Nate Jensen
|
ecd14c2cac
|
Omaha #4575 update jep version to 3.4.0
Change-Id: I0a31ed1985ff001c5be8021e68bd4dbf5558547b
Former-commit-id: b9b512b134b2ec1c38b834ff0e29a7d342272976
|
2015-07-21 11:51:39 -05:00 |
|
Nate Jensen
|
3ee2038c6c
|
Omaha #4668 upgrade scipy to version 0.15.1
Change-Id: I163effa736b24be8d25ebce2317e1c8ea5886a64
Former-commit-id: 50265ccd096e49fc085dd1403e42c664ea2f78c0
|
2015-07-21 11:19:06 -05:00 |
|
Nate Jensen
|
146caf6023
|
Omaha #4264 upgrade numpy to version 1.9.2
Change-Id: I2cd8f10ad2cf484fd299822e47992af8f9c28387
Former-commit-id: 2b259760254f0bf442b08e78d51655d8b44c8f98
|
2015-07-20 16:58:16 -05:00 |
|
Ana Rivera
|
9a33597d6e
|
Merge branch 'omaha_16.1.1' into field_16.1.1
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6
Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
|
2015-07-20 15:56:51 +00:00 |
|
Ana Rivera
|
d6196390e2
|
Merge branch 'master_15.1.1'(OB_15.1.1-24) into field_16.1.1
Change-Id: I859c9a2d9be2076e9eac89b4a5a877f37ca54074
Former-commit-id: d6f0e355d72c9be4d55c5e161331e55367bdb7b8
|
2015-07-20 15:46:28 +00:00 |
|
Steve Harris
|
815bef5003
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: d28fab431fd182b66035176003e2f6704a97506e
|
2015-07-14 08:04:29 -05:00 |
|
Steve Harris
|
55b82a66ff
|
Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java
Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
|
2015-07-13 18:39:29 -05:00 |
|
Greg Armendariz
|
f9ec20ac12
|
Omaha #4555 - Source profile scripts
Former-commit-id: 65797ec98d18fff34303ff67a40bdb0ec7230c21
|
2015-07-13 13:38:42 -05:00 |
|
David Lovely
|
71f7c482b9
|
Omaha #4259 Updating JEP to 3.3.5
Former-commit-id: 268e9a8081d171298f73c7c71b21e5be7a7ccb77
|
2015-07-09 16:52:47 -05:00 |
|
Kiran.Shrestha
|
19b6358d63
|
ASM #14528 In pqact.conf.template file PBP requests time string changed back to original.
Change-Id: Ic5305d104a320f975678ab4c2550dd7e38e703a9
Former-commit-id: ffea7833122da059f4f707025bfce37ac67c029e
|
2015-07-07 20:19:31 +00:00 |
|
Ana Rivera
|
e075f22bf7
|
Merge branch 'omaha_16.1.1' into field_16.1.1
Entry for NTAT missing from omaha_16.1.1's LevelMappingFile.xml.
Change-Id: I39893e6aa748f7dfeb30bd23bcfca3853fa51e17
Former-commit-id: cc1e4ea67074c41be411c99ce979124a63c7c743
|
2015-07-07 19:41:48 +00:00 |
|
Ana Rivera
|
e066b91c4b
|
Merge branch 'master_15.1.1'(OB_15.1.1-20) into field_16.1.1
Change-Id: Id98b18f9b406c2829d99cdfee27aa2b40194713e
Former-commit-id: b98013140a5400cbab2e338327bd6c8c74628dff
|
2015-07-07 17:30:40 +00:00 |
|
David Lovely
|
52bd59da9b
|
Omaha #4021 Update 'caveVersion' in Cave and AlertViz plugin.xml's
Change-Id: Ia0839586092e9384fbbe2945dc1d869a5006e1f7
Former-commit-id: f261aa8703159ee16d6c7354d7f30123abd3a65c
|
2015-07-07 08:55:19 -05:00 |
|
Steve Harris
|
77dd721f3a
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: 2d1718c63cb897c5a9b924be304a1b24e7a73be8
|
2015-07-06 11:50:36 -05:00 |
|
Steve Harris
|
11d147911d
|
Merge tag 'OB_15.1.1-20' into omaha_16.1.1
15.1.1-20
Conflicts:
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: d3fc25a0bc4136a28efcd024dd272373982b2c9d
|
2015-07-06 09:48:19 -05:00 |
|
Mark Peters
|
9a6dc927b0
|
Omaha #4494 Openfire monitoring plugin for collaboration
Change-Id: I1a55c738c40d9e4b1f5291e7d22b51a3b540014b
Former-commit-id: 66284f1f414dc308f47ff6981537dabcd734ea78
|
2015-07-01 16:53:20 -05:00 |
|
Fay.Liang
|
5b46f7167a
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 7b515d6f5d04bf40491984bf666e6773765b1eaa
|
2015-07-01 17:28:27 -04:00 |
|
Fay.Liang
|
9a82bf2c71
|
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 57fc6f5ceade22a9eba75931674df6b9f467db32
|
2015-07-01 17:27:06 -04:00 |
|
Sean.Webb
|
e42a6a0434
|
ASM #14314 - Change N text patterns to ANY and removed NWUS6 WCL header
Change-Id: I29c4ebf3521c4b2742056e9691b506b011c9af5f
Former-commit-id: 6d29e90464846502b27b3e8d4125eaf3182df2aa
|
2015-07-01 13:07:51 -04:00 |
|
Sean.Webb
|
1ea92410a9
|
ASM #17608 - Added pattern to handle encrypted WCL
Change-Id: I212cf173b27be73c6249f39c8a7bd963f7791747
Former-commit-id: bbd0932910f2f03712d172bf0a526b5a0e34cce5
|
2015-07-01 12:41:50 -04:00 |
|
Steve Harris
|
50dea948f2
|
Omaha #4559 - Updated Master_Rights_File.pdf - Added maven-3.2.3
Former-commit-id: 5303df2c2f6f079123f58befdcfb262f4b303218
|
2015-06-29 09:24:42 -05:00 |
|
Sean.Webb
|
1b4e1f86ba
|
ASM #17631 - Fixed nucaps pattern
Change-Id: I4b99a37bdacc1e8cbe7af460ad10fd9d0c0a643a
Former-commit-id: 9c0b1572e34e542d198bbed7f0cdd7cd2ebe5ab9
|
2015-06-26 10:13:45 -04:00 |
|
Fay.Liang
|
8477d14de1
|
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
Former-commit-id: e4e478a6018c61305b77ff7440bd85857a093ffd
|
2015-06-26 10:00:03 -04:00 |
|
Greg Armendariz
|
450c26856d
|
Omaha #4555 - Update yajsw script, move yajsw installer to AWIPS2_build
Change-Id: I92d040fb64db5f552af899944cc0a0c0d1ca5e2e
Former-commit-id: 6e91835b5944d26749e2d418e27a87f0dd633453
|
2015-06-25 14:01:12 -05:00 |
|
David Lovely
|
bb82cad883
|
Omaha #4582 Added Maven to support QPID build
Former-commit-id: 6ce24960c0d25e6045405e2ed0702a3bd37a0696
|
2015-06-25 09:57:12 -05:00 |
|
Fay.Liang
|
3a7f06fd9f
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Former-commit-id: f8a23cd9ea8e197f6a03c9cc0f7db9ed73471c8b
|
2015-06-23 20:26:32 -04:00 |
|
Steve Harris
|
0d0d85fb81
|
Merge branch 'omaha_15.1.1' into omaha_16.1.1
Former-commit-id: 275eb8a00d1408ed6c5b90abfe8cf20ceabfdcae
|
2015-06-22 16:41:24 -05:00 |
|
Joshua Watson
|
f6d61cc1e6
|
VLab Issue #8489 - Add ESTOFS Pacific basin data; fixes #8489
Change-Id: I033bcc8116f7d4bef4aa017fd62ea8f049372ca4
Former-commit-id: 694cbaad0bad4aae7c2e67c44ca3106a73b97d77
|
2015-06-22 14:37:43 -04:00 |
|
Sean.Webb
|
a7c9b901cd
|
ASM #17631 - Added nucaps pattern to pqact.conf.template
Change-Id: Ife984a244c6a5d4858df10f557bc6973d72dc332
Former-commit-id: 23c8b875e307ea8acfb3d08443ecd221534b7cbb
|
2015-06-19 10:13:29 -04:00 |
|
Steve Harris
|
1bae3c767c
|
Omaha #4559 - Updated foss licenses and Master_Rights_File.pdf - Added Enthought for scipy
Former-commit-id: 2496ad971505bc2d7bf3c72a234ea5496805b053
|
2015-06-18 08:50:15 -05:00 |
|
Steve Harris
|
569e809433
|
Omaha #4559 - Updated foss licenses and Master_Rights_File.pdf
Former-commit-id: 56c9e3ab96d595787ef3bf75f738b66d2dcee607
|
2015-06-15 15:35:22 -05:00 |
|
Greg Armendariz
|
733e4a0c31
|
Omaha #4504 - Update location to awips2-static/maps/20150608
Change-Id: I97562d9921eeee2a73a131519c338dc58be41f0a
Former-commit-id: be5a7f302d3474fb4b86cc4b12e1507f088b0098
|
2015-06-08 15:31:24 -05:00 |
|
Steve Harris
|
4de63454fc
|
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
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/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
|
2015-06-05 15:38:00 -05:00 |
|
Steve Harris
|
7e7cdd1c7a
|
Merge tag 'OB_15.1.1-14' into omaha_16.1.1
15.1.1-14
Conflicts:
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Former-commit-id: 92470a2ce7952ee72dbe2557ee16ee54d7ae901c
|
2015-06-04 11:08:19 -05:00 |
|
Fay.Liang
|
c9e484c311
|
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
Former-commit-id: f2b3a2fc2c1a5362673fed5b4841cd6d5d86ea5d
|
2015-05-29 15:43:59 -04:00 |
|
Sean.Webb
|
90bb72d49d
|
ASM #17513 - Added PWSAT pattern
Change-Id: I6658dfed7460b38d826cc6ee6fc4600c1dd35cf4
Former-commit-id: 2b940dcfc16c445c055696ff08177196f708f935
|
2015-05-28 17:11:41 -04:00 |
|
Ana Rivera
|
d5da5dfff6
|
Merge branch 'master_15.1.1'(master_15.1.1-12) into field_15.1.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9c737b735af5d1066448c71e1ffc09a1129f7435
Former-commit-id: 1f5ab00d137a3e5e75a20b15a65c4b34596a9b38
|
2015-05-21 13:39:59 +00:00 |
|
Greg Armendariz
|
7d509067ff
|
Omaha #4488 Add netcdf depenency to awips2-common-base and awips2-database
Former-commit-id: f622d1ab93bcb98b2389677cbf8b95db2944b212
|
2015-05-20 13:58:28 -05:00 |
|
Steve Harris
|
9b3d8a8443
|
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
|
2015-05-20 11:25:45 -05:00 |
|
Shawn.Hooper
|
003c528458
|
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
|
2015-05-12 11:30:23 -04:00 |
|
Fay.Liang
|
a07bb535be
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 02ea64b8c62525e9ec63bce9ad0d573fa4f6d6c0
|
2015-05-12 10:06:11 -04:00 |
|
Ana Rivera
|
12f8c4cf81
|
Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I33c3dd2cc2b8be8a8ca9370839f07512b12d8e6d
Former-commit-id: 8608cf4250be497aa20d13088a20bece02befd92
|
2015-05-11 20:21:13 +00:00 |
|
Kevin.Johnson
|
1e4e452389
|
ASM #17480 - added HFR pattern to pqact.conf.template
Change-Id: I01c4a9bc038e41aadcf81b6e7ec9667d214a702f
Former-commit-id: 65dfaecbbe9bc276fbe77d6646e89085311c3dae
|
2015-05-11 12:57:51 -04:00 |
|
Steve Harris
|
2cc7b15af1
|
Merge tag 'OB_14.4.1-36' into omaha_14.4.1
14.4.1-36
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 8256d399c695b9ebcd8966d34fbc7f938505b574
|
2015-05-08 13:01:38 -05:00 |
|