Commit graph

5408 commits

Author SHA1 Message Date
Melissa Porricel
5d50b3996e ASM #530 - Enable calculation/display of snow accum for GFSEnsemble
Change-Id: I0036ab27ba16fc530d48853e9de4b3f7e763dc43

Former-commit-id: c5fed02653 [formerly 9a72fdc4e2] [formerly c5fed02653 [formerly 9a72fdc4e2] [formerly 7cd9dec78e [formerly fe1d0f147e2b0e4106afd092bb381e7958ca7a6e]]]
Former-commit-id: 7cd9dec78e
Former-commit-id: 1f57189285 [formerly be42595ba7]
Former-commit-id: aafeee18a1
2014-04-14 11:48:00 -04:00
Richard Peter
4ca584c465 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
Former-commit-id: 97fb03df02 [formerly 91e941f60a] [formerly 97fb03df02 [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: a4eba6e6df [formerly ffd74e6787]
Former-commit-id: c072d0d0ca
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
25c850b9d8 Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: 2d66e58671 [formerly dd794a3c12] [formerly 2d66e58671 [formerly dd794a3c12] [formerly 428f3a2d8b [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: b120feab6f [formerly 6c92b645f0]
Former-commit-id: 0b6ca56417
2014-04-11 17:37:59 -05:00
Richard Peter
a22345ea6b Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
2014-04-11 16:23:09 -05:00
Zhidong.Hao
2b0fd93679 ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1

Former-commit-id: f5877f5fb0 [formerly 0b499061da] [formerly f5877f5fb0 [formerly 0b499061da] [formerly 9c18f60924 [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]]
Former-commit-id: 9c18f60924
Former-commit-id: 3adcd5bca5 [formerly 13808687c1]
Former-commit-id: 7996e95745
2014-04-11 15:51:12 -04:00
Zhidong.Hao
a846d4c4f5 ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c

Former-commit-id: 48ee7712c7 [formerly 009c6e067a] [formerly 48ee7712c7 [formerly 009c6e067a] [formerly 1a91b820d9 [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]]
Former-commit-id: 1a91b820d9
Former-commit-id: ab0c9a65d2 [formerly c6d9a3926e]
Former-commit-id: a94bf1a110
2014-04-11 15:34:06 -04:00
Qinglu.Lin
a849842e06 ASM #505 - Color table editor does not allow enough significant digits
Change-Id: I2b98ec0de0ebef7b585574d063ddf87834edd44a

Former-commit-id: 6741deb3c2 [formerly 3bae853360] [formerly 6741deb3c2 [formerly 3bae853360] [formerly 18804fe98e [formerly 2b9cb3e46fbd1598e95a4ea3a866741fed6603d9]]]
Former-commit-id: 18804fe98e
Former-commit-id: dd6ff185c7 [formerly 2659a9ce4d]
Former-commit-id: 1c242f9e50
2014-04-11 12:22:44 -04:00
Brian.Dyke
8cc1d09d35 ASM #465 - Update capture script to prevent hanging when running psql
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c

Former-commit-id: af5cbe3321 [formerly 192a5513df] [formerly af5cbe3321 [formerly 192a5513df] [formerly deff8ed340 [formerly 17ab69323dd1b420662db25e09b05e3408d3f2ab]]]
Former-commit-id: deff8ed340
Former-commit-id: 4efe23ee2c [formerly 97687e7217]
Former-commit-id: 52efde1ca0
2014-04-11 11:18:06 -04:00
brian.dyke
f299a28f9b Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 6a9ccba393 [formerly 6575f77fe3] [formerly 6a9ccba393 [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 88ddd667b6 [formerly ad63114f16]
Former-commit-id: 1c4e02168c
2014-04-11 10:58:48 -04:00
Richard Peter
b6c8960328 Merge "Issue #2864 - Change how saved subset files are stored." into development
Former-commit-id: 69c6217ae9 [formerly 8a682a5e23] [formerly 69c6217ae9 [formerly 8a682a5e23] [formerly 695878c6aa [formerly 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c]]]
Former-commit-id: 695878c6aa
Former-commit-id: b4cc44faa0 [formerly 0fa4180959]
Former-commit-id: e858f14a8c
2014-04-11 09:41:31 -05:00
Richard Peter
852dc3c790 Merge "Issue #2905 modified ucar BUFR library to fix bug" into development
Former-commit-id: e235baf81d [formerly 4681ba4a76] [formerly e235baf81d [formerly 4681ba4a76] [formerly 8e33f38232 [formerly 84fd4953a8aaf0ada4dbb96e3fea911b43247bc7]]]
Former-commit-id: 8e33f38232
Former-commit-id: f3125d1a87 [formerly 032c8b17bd]
Former-commit-id: 896d0d1e9f
2014-04-11 09:40:36 -05:00
Ron Anderson
9ee1129c2d Merge "Issue #2730 remove extracted numpy directories and files" into development
Former-commit-id: b768cea758 [formerly 6d55f4a7c7] [formerly b768cea758 [formerly 6d55f4a7c7] [formerly de12c875f2 [formerly 9c4b8db9c034dcf4ce2eb1302fca38ae6a909874]]]
Former-commit-id: de12c875f2
Former-commit-id: 19638b6d43 [formerly 632a1e4592]
Former-commit-id: e435ee7252
2014-04-11 08:46:17 -05:00
Mike Duff
8b46df102d Issue #2864 - Change how saved subset files are stored.
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: a58f279b54 [formerly 82cf444d6f] [formerly a58f279b54 [formerly 82cf444d6f] [formerly 890faf2d73 [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]]
Former-commit-id: 890faf2d73
Former-commit-id: dc2a5b0c6f [formerly 6d8bead4a7]
Former-commit-id: 583a4b1cea
2014-04-11 08:27:42 -05:00
Everett Kladstrup
e6b168be44 Issue #2725 remove wxmath from edex.common.core
Former-commit-id: 8e726ad379 [formerly c2d27d11f2] [formerly 8e726ad379 [formerly c2d27d11f2] [formerly 25414de245 [formerly 84b372c36f8f0ef707f124e06fe32eb2b41d8b0f]]]
Former-commit-id: 25414de245
Former-commit-id: f40a46aef0 [formerly fed45e26d8]
Former-commit-id: 7fc4924e25
2014-04-10 17:42:07 -05:00
Nate Jensen
0bac0fa185 Merge "Issue #2937 Connect to the venue after the feed view is available." into development
Former-commit-id: c7593d61c4 [formerly 5fc6942fab] [formerly c7593d61c4 [formerly 5fc6942fab] [formerly b3b9dbff67 [formerly 11985e2127b29ee4e67288579c273d1ac75cc902]]]
Former-commit-id: b3b9dbff67
Former-commit-id: 7f32159599 [formerly 4a395ff2bc]
Former-commit-id: ff5519566f
2014-04-10 16:59:17 -05:00
Brian Clements
f42e6160df Issue #2905 modified ucar BUFR library to fix bug
Former-commit-id: 00c0403ec5 [formerly 184c2c3d77] [formerly 00c0403ec5 [formerly 184c2c3d77] [formerly 640391682f [formerly d340cd72b224dedec1839bfdc75873faa8140ea9]]]
Former-commit-id: 640391682f
Former-commit-id: 81f93a1929 [formerly 0d8909db10]
Former-commit-id: e1205f11c0
2014-04-10 16:43:10 -05:00
Nate Jensen
f3702f51df Merge "Issue #2725 Moving derivparam plugins to the lowest applicable features" into development
Former-commit-id: 2fc2442dc4 [formerly e1dbbe718b] [formerly 2fc2442dc4 [formerly e1dbbe718b] [formerly 59d51c7d0b [formerly 653d2d2ef03b8f2b7a5c214d8e9b7b6284fe6b7b]]]
Former-commit-id: 59d51c7d0b
Former-commit-id: 4898952f4f [formerly 51400be34f]
Former-commit-id: f5ec04270a
2014-04-10 16:36:26 -05:00
Everett Kladstrup
9327eebf87 Issue #2725 Moving derivparam plugins to the lowest applicable features
Former-commit-id: 7fd3d7ce3d [formerly b074c88957] [formerly 7fd3d7ce3d [formerly b074c88957] [formerly ed0c157e33 [formerly 4397d0c6018858ab967110884cfdb7771c08e199]]]
Former-commit-id: ed0c157e33
Former-commit-id: 70a383f68d [formerly b9f67d3bae]
Former-commit-id: 5f280b7352
2014-04-10 16:00:22 -05:00
Richard Peter
e799fcad22 Merge "Issue #2906 removed accidental manifest entry for bufr obs" into development
Former-commit-id: 868d32cbbc [formerly 2b28e47e44] [formerly 868d32cbbc [formerly 2b28e47e44] [formerly b2962db1f0 [formerly 6aad1ccde2c4a0b50e6f11cca6690b039a393568]]]
Former-commit-id: b2962db1f0
Former-commit-id: 8185a9120c [formerly 2955520b41]
Former-commit-id: 7dbc35360a
2014-04-10 15:54:34 -05:00
Brian Clements
ba3f3443ea Issue #2906 removed accidental manifest entry for bufr obs
Former-commit-id: c4bbcc0688 [formerly f2d2cab0fc] [formerly c4bbcc0688 [formerly f2d2cab0fc] [formerly e8708eb44d [formerly 76eb62c08d300e5c47321b9ecbfe65814bcf2960]]]
Former-commit-id: e8708eb44d
Former-commit-id: b83dc2f4e9 [formerly ca43897d73]
Former-commit-id: 21f66143d4
2014-04-10 15:31:53 -05:00
Nate Jensen
ddae3ce724 Merge "Issue #2725 Put derivparam plugins in viz and edex separately" into development
Former-commit-id: ecafc30027 [formerly ffc903d5c4] [formerly ecafc30027 [formerly ffc903d5c4] [formerly 7f8478ee0b [formerly 7e57057056f7bf092336a915a2bfec652be268eb]]]
Former-commit-id: 7f8478ee0b
Former-commit-id: 17bf6198d9 [formerly 11fd8d8055]
Former-commit-id: 632bfbb636
2014-04-10 15:12:24 -05:00
Nate Jensen
746c4d7908 Merge "Issue #2906 added synop bufr obs decoder" into development
Former-commit-id: 2df73a6601 [formerly 75b5f5b658] [formerly 2df73a6601 [formerly 75b5f5b658] [formerly 439dc71571 [formerly d214a46f19a939eec5d23d0c9029b1e85eaad447]]]
Former-commit-id: 439dc71571
Former-commit-id: 91c478cb8f [formerly 8788d46064]
Former-commit-id: 86b146a3ff
2014-04-10 15:09:39 -05:00
Brad Gonzales
be94e8a876 Issue #2730 remove extracted numpy directories and files
Change-Id: Ib1f47007c8820e89f75dadc25682aff7f356e99d

Former-commit-id: 99d4fc15ef [formerly 0e7f4d714d] [formerly 99d4fc15ef [formerly 0e7f4d714d] [formerly 9b73789b20 [formerly 329f95c875e55790821801fb0f7d70c26adc54f2]]]
Former-commit-id: 9b73789b20
Former-commit-id: d529943e99 [formerly edd15f2da6]
Former-commit-id: 16e48a8b1f
2014-04-10 15:04:50 -05:00
Everett Kladstrup
1467f1a316 Issue #2725 Put derivparam plugins in viz and edex separately
Former-commit-id: 90244ad7ec [formerly d76aaed2f0] [formerly 90244ad7ec [formerly d76aaed2f0] [formerly 1a8a05cd0e [formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]
Former-commit-id: 1a8a05cd0e
Former-commit-id: fa9ee97662 [formerly db413dc65f]
Former-commit-id: 1a68ea889a
2014-04-10 14:08:42 -05:00
Brad Gonzales
91d546d015 Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 5fcec27765 [formerly cc0fd1e9af] [formerly 5fcec27765 [formerly cc0fd1e9af] [formerly ea03096031 [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]
Former-commit-id: ea03096031
Former-commit-id: e41f9defa4 [formerly 3b25edad9a]
Former-commit-id: 8f72707b3a
2014-04-10 14:01:53 -05:00
Nate Jensen
7cae36a45e Merge "Issue #1803 fix redbook sharing in collaboration" into development
Former-commit-id: 74a7189143 [formerly e88519c5e3] [formerly 74a7189143 [formerly e88519c5e3] [formerly 666b271528 [formerly 296b4dee5e8907296c45b8372b5dffe28a2b9f4c]]]
Former-commit-id: 666b271528
Former-commit-id: 5d17f07d25 [formerly 573981b0d5]
Former-commit-id: 4cffa91903
2014-04-10 13:50:55 -05:00
Brian.Dyke
fbefee3e1d Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: 73be1016c0 [formerly 8c2f601b59] [formerly 73be1016c0 [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: afc1da9015 [formerly ff51498036]
Former-commit-id: f051b95a7a
2014-04-10 13:26:42 -04:00
Brian Clements
e322c66ddd Issue #2906 added synop bufr obs decoder
fixed units in sfcobs point data description
made getDescription() and static constants public in point data transform
fixed typo in udunits alias file
created new decoder for synop bufr obs
added decoder and dependencies to features


Former-commit-id: 1e2ad93e65 [formerly 663337e661] [formerly 1e2ad93e65 [formerly 663337e661] [formerly 972d18cd3b [formerly b35756921a0ba5ff240b80f92322da90345c6eaf]]]
Former-commit-id: 972d18cd3b
Former-commit-id: e34f218002 [formerly a072496474]
Former-commit-id: 8388c00dc3
2014-04-10 12:08:27 -05:00
David Gillingham
2ab21ac335 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 1c7e650e6a [formerly c8a6dc8769] [formerly 1c7e650e6a [formerly c8a6dc8769] [formerly da31ab2042 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]
Former-commit-id: da31ab2042
Former-commit-id: 0385a4395e [formerly 72229cfb94]
Former-commit-id: 89046665f6
2014-04-10 11:24:40 -05:00
Nate Jensen
71e01e0264 Issue #1803 fix redbook sharing in collaboration
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e

Former-commit-id: 4cccdac37e [formerly 1efb9a2a4d] [formerly 4cccdac37e [formerly 1efb9a2a4d] [formerly 4a826332e9 [formerly fdf384ea4cedebbf06c5e4861a5a7cdcc72533b4]]]
Former-commit-id: 4a826332e9
Former-commit-id: 2750a173dc [formerly a191b473e2]
Former-commit-id: a3fef22e8b
2014-04-10 10:50:33 -05:00
Nate Jensen
fc4f5c60e6 Merge "Issue #2694 Improve error handling" into development
Former-commit-id: 288aa9b52c [formerly e327184bdc] [formerly 288aa9b52c [formerly e327184bdc] [formerly 9357bdfb0e [formerly a8707e3914a48b27d428340240eaa3eff48832f7]]]
Former-commit-id: 9357bdfb0e
Former-commit-id: 64f44d5e6c [formerly 3151a36ead]
Former-commit-id: a260797465
2014-04-10 10:23:22 -05:00
Ron Anderson
b5adcd9707 Issue #2694 Improve error handling
Change-Id: I576cd4950d73fd6ce82f982dbc165e18ecb240f3

Former-commit-id: 11f7c48504 [formerly e66c93553d] [formerly 11f7c48504 [formerly e66c93553d] [formerly 70faf6e7aa [formerly b9307d47ad5dabfd9664197025b675e0103e57ad]]]
Former-commit-id: 70faf6e7aa
Former-commit-id: 563e343ca6 [formerly 6891dab959]
Former-commit-id: 3886fae260
2014-04-10 10:11:22 -05:00
Brad Gonzales
60f66cda85 Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: fe95275a34 [formerly 056dbdbdff] [formerly fe95275a34 [formerly 056dbdbdff] [formerly d50f39e98d [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]]]
Former-commit-id: d50f39e98d
Former-commit-id: 7472fb8084 [formerly 178e4fe8bb]
Former-commit-id: ebcb2cb414
2014-04-09 18:47:09 -05:00
Richard Peter
79e207774f Merge "Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks." into development
Former-commit-id: 8925673f3c [formerly 394a41738f] [formerly 8925673f3c [formerly 394a41738f] [formerly 8b98ee101c [formerly cfbbae53d8466f647a7258047604bb10c9fef682]]]
Former-commit-id: 8b98ee101c
Former-commit-id: 923b6887dc [formerly dfd19e7904]
Former-commit-id: 7a66487514
2014-04-09 16:42:31 -05:00
Nate Jensen
00fea2a73c Merge "Issue #2907 fix redbook decoding of month" into development
Former-commit-id: a7776cf961 [formerly 3aa8d0bfea] [formerly a7776cf961 [formerly 3aa8d0bfea] [formerly 01834f722a [formerly e8054a6cba060649a2bbe31ce4f2d8c704150ecf]]]
Former-commit-id: 01834f722a
Former-commit-id: 889db28e82 [formerly dac775ed4e]
Former-commit-id: ab92e421cb
2014-04-09 16:10:45 -05:00
Nate Jensen
5e95530353 Issue #2907 fix redbook decoding of month
Change-Id: Ieccea813452ba5708f039ea8aad0fd6f83c16f9a

Former-commit-id: 8b9e22751a [formerly 411779ce6f] [formerly 8b9e22751a [formerly 411779ce6f] [formerly 5905ff0dcf [formerly 74340639a9522668ea6b2113771d5828919c7f02]]]
Former-commit-id: 5905ff0dcf
Former-commit-id: 08f3535a49 [formerly 0630c1bc0c]
Former-commit-id: c1005eec2d
2014-04-09 16:07:56 -05:00
Nate Jensen
c2f1f5542a Merge "Issue #2725 Add new project to alertviz feature" into development
Former-commit-id: 56b820ab97 [formerly ec40cb3dfc] [formerly 56b820ab97 [formerly ec40cb3dfc] [formerly eaf1382178 [formerly 9cacee78da76f5da13b0a78a3e0a347a647050cf]]]
Former-commit-id: eaf1382178
Former-commit-id: a0e2342126 [formerly 952586230a]
Former-commit-id: 8c6704e442
2014-04-09 16:07:25 -05:00
Everett Kladstrup
de0f935f69 Issue #2725 Add new project to alertviz feature
Former-commit-id: 963ce8716e [formerly e4633811fc] [formerly 963ce8716e [formerly e4633811fc] [formerly 02b47e4d5a [formerly 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e]]]
Former-commit-id: 02b47e4d5a
Former-commit-id: c2a96ba985 [formerly 55638c0916]
Former-commit-id: a00b1dd9f6
2014-04-09 16:01:57 -05:00
Richard Peter
421b2716a4 Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: 5676090443 [formerly 95eba8dcf6] [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: f1b85f6964 [formerly 73aab15d85]
Former-commit-id: b667e0509f
2014-04-09 16:00:54 -05:00
Nate Jensen
560bdaf4c8 Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
Former-commit-id: ad961bb84d [formerly 0dd55f63ba] [formerly ad961bb84d [formerly 0dd55f63ba] [formerly 88d0e400fb [formerly 4d91a4fedbba2164f1e11a2fbaea8e0b1dbe6340]]]
Former-commit-id: 88d0e400fb
Former-commit-id: dfac2a42c2 [formerly a2c4c63852]
Former-commit-id: 5a2f9a2e04
2014-04-09 14:07:09 -05:00
Everett Kladstrup
136af85d0c Issue #2725 Remove datacube plugin from viz.core feature
Former-commit-id: b670fa67f6 [formerly 50346d5aec] [formerly b670fa67f6 [formerly 50346d5aec] [formerly ef21ea5c1f [formerly 1c72a291c9623f3930ca71da67e87ef884c81a94]]]
Former-commit-id: ef21ea5c1f
Former-commit-id: fd9bd8282a [formerly 9faba2afbf]
Former-commit-id: 21c7199512
2014-04-09 13:59:11 -05:00
Roger Ferrel
6508e30611 Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908

Former-commit-id: 032ee7ef77 [formerly 226b1be015] [formerly 032ee7ef77 [formerly 226b1be015] [formerly c86d738d5b [formerly 09e4f116a482f2a197c01cdec3609e10e1d2285d]]]
Former-commit-id: c86d738d5b
Former-commit-id: eec1d22987 [formerly 0d85ae72e0]
Former-commit-id: 388ea1349a
2014-04-09 13:57:55 -05:00
Everett Kladstrup
619ccff21b Issue #2725 Add new plugin to uf.viz.base feature
Former-commit-id: 91673b18b0 [formerly 8d918404d5] [formerly 91673b18b0 [formerly 8d918404d5] [formerly 28364c8618 [formerly 828a32f1753a40613bb0351281458bee1d45cba6]]]
Former-commit-id: 28364c8618
Former-commit-id: d968a60023 [formerly 378193b61f]
Former-commit-id: 64dad45a1c
2014-04-09 13:43:09 -05:00
Steve Harris
bab730727e Merge branch 'master_14.2.2' (14.2.2-3) into omaha_14.2.2
Former-commit-id: 842e355cc7 [formerly ae196946b9] [formerly 842e355cc7 [formerly ae196946b9] [formerly 2ea3d45ecc [formerly 0b9acf9e28c1048bd3b98af7c04e6953c8425e81]]]
Former-commit-id: 2ea3d45ecc
Former-commit-id: cf3bc163b6 [formerly 2efe4d5c6f]
Former-commit-id: d2f3b72736
2014-04-09 13:24:52 -05:00
Ben Steffensmeier
28f06f5bfc Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps.
Former-commit-id: 9c5eb936d3 [formerly 5328415054] [formerly 9c5eb936d3 [formerly 5328415054] [formerly daff2b9d9d [formerly 67302674101992ae5416f342f92acab9233a113d]]]
Former-commit-id: daff2b9d9d
Former-commit-id: 88f5dbe81d [formerly f5271a94d6]
Former-commit-id: cf81a60e7c
2014-04-09 13:19:21 -05:00
Richard Peter
80ad3d483f Merge "Issue #2725 Post "derived parameter move" changes" into development
Former-commit-id: bf4617bc39 [formerly c6dd5bee41] [formerly bf4617bc39 [formerly c6dd5bee41] [formerly c1dde5cb3a [formerly 635ea082393013a6967f177c419204197c9741f2]]]
Former-commit-id: c1dde5cb3a
Former-commit-id: caa3b3c51f [formerly 4084c12c27]
Former-commit-id: f9619588bd
2014-04-09 11:37:09 -05:00
Nate Jensen
edc55ee2ca Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development
Former-commit-id: 187a895056 [formerly b58bb8500c] [formerly 187a895056 [formerly b58bb8500c] [formerly 2c2e324401 [formerly c66a85a125bb590abad607eb751b0baf9c07a3ba]]]
Former-commit-id: 2c2e324401
Former-commit-id: f574c535f5 [formerly 8999051f04]
Former-commit-id: 4af6b91229
2014-04-09 11:22:07 -05:00
Nate Jensen
801f6f7a5c Merge "Issue #2950 Add option to interpolate image colors." into development
Former-commit-id: 0da28c9c7a [formerly 1f2809ced0] [formerly 0da28c9c7a [formerly 1f2809ced0] [formerly d729cc70af [formerly 1db00446a00b6cd268b169871eadd1bef407e268]]]
Former-commit-id: d729cc70af
Former-commit-id: 6f36916c31 [formerly c460736793]
Former-commit-id: 91ef6f7b9c
2014-04-09 11:20:59 -05:00
Everett Kladstrup
abf4bd55a1 Issue #2725 Post "derived parameter move" changes
* move derived parameter definitions to base localization level
* remove java 7 exception constructor from inventory plugin
* move python function adapter to derivparam.python plugin


Former-commit-id: 0e88702cea [formerly 16b4c9253e] [formerly 0e88702cea [formerly 16b4c9253e] [formerly 41b154802c [formerly c54110914a3a64a2ea7c22093327c9e0d84689b2]]]
Former-commit-id: 41b154802c
Former-commit-id: 2ace82f815 [formerly f6bf1f43bd]
Former-commit-id: a89211f60a
2014-04-09 11:20:14 -05:00
Nate Jensen
4fe2e3a01b Merge "Issue #2950 Support dynamic color counts for color map editing." into development
Former-commit-id: 6989999e95 [formerly 5129002e91] [formerly 6989999e95 [formerly 5129002e91] [formerly 5bad21f3e6 [formerly b196bf0463ea59d55dec4e70373ca731152123f9]]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 58516f3a9f [formerly 92f0182d3f]
Former-commit-id: a08e3a4f1a
2014-04-09 11:20:04 -05:00