Commit graph

1433 commits

Author SHA1 Message Date
Ben Steffensmeier
f2466d6066 Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: 7b7b708eee [formerly 6c741a9ab3] [formerly 7b7b708eee [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]
Former-commit-id: 86dffab17d
Former-commit-id: 160b6a7040 [formerly dfe8de96f2]
Former-commit-id: e176478c7a
2013-03-18 17:16:44 -05:00
Steve Harris
9d4d1baefe Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
2013-03-18 16:43:22 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
2013-03-18 15:43:32 -05:00
Lee Venable
0449fe84a6 Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
Former-commit-id: 57d7559797 [formerly 456fd056f4] [formerly 57d7559797 [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]
Former-commit-id: 93e99b64a6
Former-commit-id: ba4673b99a [formerly 3a1dc41b50]
Former-commit-id: cac220879d
2013-03-14 17:19:38 -05:00
Dave Hladky
871c4718ab Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: a1c4148918 [formerly 9b495681ec] [formerly a1c4148918 [formerly 9b495681ec] [formerly c57d5574ef [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]
Former-commit-id: c57d5574ef
Former-commit-id: 3ba473351b [formerly db207a732c]
Former-commit-id: 5bf3f5f89f
2013-03-14 15:59:39 -05:00
Ron Anderson
bd0618d53f Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
Former-commit-id: 60af3ad63e [formerly 16d93dab84] [formerly 60af3ad63e [formerly 16d93dab84] [formerly fc749ff3eb [formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]]
Former-commit-id: fc749ff3eb
Former-commit-id: 97a38fd3c5 [formerly 7087e1ebe7]
Former-commit-id: e6ba869694
2013-03-14 14:55:31 -05:00
Ben Steffensmeier
41e3ac3923 Issue #1793 Performance improvements for TCMWindTool
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e

Former-commit-id: 7335a2336e [formerly 7aa8b2d3eb] [formerly 7335a2336e [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 055873318a368301fc966501b27001f5ace0bcae]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: e5b9e0ca46 [formerly 364d6fd9ee]
Former-commit-id: 153a7dbd7d
2013-03-14 13:26:08 -05:00
Greg Armendariz
cfc53af85e Removed merge code from the source code
Former-commit-id: 2bb407ea8b [formerly 5511f0b3a6] [formerly 2bb407ea8b [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 9652fe27ae424cba83296a714a720e554390550a]]]
Former-commit-id: 2f9136843b
Former-commit-id: b79ecc28e3 [formerly 3a3486b0b7]
Former-commit-id: 8ea2042456
2013-03-14 11:15:08 -05:00
Nate Jensen
c710def06d Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]
Former-commit-id: 490ffe2772
Former-commit-id: e2e9a845d5 [formerly a933532ad9]
Former-commit-id: 363efaec00
2013-03-14 09:48:16 -05:00
Ben Steffensmeier
7266a995f9 Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: a9695abb45 [formerly 22624ba5d3] [formerly a9695abb45 [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]
Former-commit-id: 52c167cf00
Former-commit-id: 2d622e6053 [formerly 8f6a7c0746]
Former-commit-id: 60bb04a055
2013-03-13 18:52:52 -05:00
Ron Anderson
39e2d27a89 Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: 0c881b4a85 [formerly 3b65608373] [formerly 0c881b4a85 [formerly 3b65608373] [formerly 61f74305e2 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 61f74305e2
Former-commit-id: de14cd0baa [formerly a7b6e1689b]
Former-commit-id: b1088415cd
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
f012dd8b0a Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: 37bae0988b [formerly 4c150b0fd6] [formerly 37bae0988b [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 89eb902284
Former-commit-id: f5680beaa9 [formerly 7abf3cfb39]
Former-commit-id: 6d699f7713
2013-03-13 17:09:20 -05:00
Dave Hladky
b85e19282b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 9e97fc9efe [formerly 160e1594b8]
Former-commit-id: cb5ee4a7b8
2013-03-13 13:56:33 -05:00
Steve Harris
88b28c39c1 13.3.1-7 baseline
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: ed5f1dbab6 [formerly 31c0a97dca]
Former-commit-id: 3084a860cd
2013-03-13 09:50:28 -05:00
Dave Hladky
cdfbcc7136 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	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/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: 155903d135 [formerly 6ea95002de]
Former-commit-id: 29ed641a13
2013-03-12 15:48:34 -05:00
Lee Venable
ca95cb0fce Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 9a69cd3524 [formerly d5af1f02c5] [formerly 9a69cd3524 [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]
Former-commit-id: 28d74d91b0
Former-commit-id: b471e3807f [formerly e080fb5106]
Former-commit-id: b0e9ea9157
2013-03-12 09:08:44 -05:00
Mike Duff
3eef80b3d1 Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 492cf0f7e6 [formerly 6a6844fdaf] [formerly 492cf0f7e6 [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]
Former-commit-id: cac9bd6119
Former-commit-id: 2df046d409 [formerly caed059e23]
Former-commit-id: 659a2a4f4c
2013-03-12 09:03:08 -05:00
Steve Harris
c28f3aeb02 13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b]
Former-commit-id: c6f379f59a
2013-03-12 08:35:45 -05:00
Roger Ferrel
241dfb9451 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 70bd9aafa7 [formerly 4deb731bd0] [formerly 70bd9aafa7 [formerly 4deb731bd0] [formerly b421c97d86 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: 0deb290c24 [formerly 334f2c4a57]
Former-commit-id: 0bbe51355e
2013-03-11 13:00:44 -05:00
Dave Hladky
a24150df56 Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: 50696bee89 [formerly 2a854d7c30] [formerly 50696bee89 [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]
Former-commit-id: bb4c54eff0
Former-commit-id: dd446abd03 [formerly 73c21a6ead]
Former-commit-id: 6fe48593f0
2013-03-08 09:58:17 -06:00
Nate Jensen
4a53109fb2 Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

Former-commit-id: f101934a30 [formerly a7e9cfdb39] [formerly f101934a30 [formerly a7e9cfdb39] [formerly 163f93019b [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]]
Former-commit-id: 163f93019b
Former-commit-id: c4175c161f [formerly d6c3c84d30]
Former-commit-id: 63eb6e6d21
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
852b61f7e1 Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: 80ea3e1ec2 [formerly 8f70214f66] [formerly 80ea3e1ec2 [formerly 8f70214f66] [formerly 6a3281c878 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]]
Former-commit-id: 6a3281c878
Former-commit-id: 234d73c905 [formerly c2b021427b]
Former-commit-id: 1403713fab
2013-03-05 16:02:47 -06:00
Steve Harris
d842ed88a7 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: b423579e4a [formerly a8e1557c62]
Former-commit-id: b630339eb7
2013-03-05 12:27:49 -06:00
Steve Harris
79ff805090 13.3.1-5 baseline
Former-commit-id: 8123d5ac45 [formerly a89221c75b] [formerly 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: a240379588 [formerly a40c9136fe]
Former-commit-id: 1f98e01c57
2013-03-05 10:47:06 -06:00
Steve Harris
153aadc1d7 13.3.1-4 baseline
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: 3e0614b43a [formerly 5e55ded3a9]
Former-commit-id: 0df35cc5ec
2013-03-05 10:39:59 -06:00
Nate Jensen
081284a2f8 Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: b393674ef3 [formerly b803ae3801] [formerly b393674ef3 [formerly b803ae3801] [formerly a952d48b3e [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]]
Former-commit-id: a952d48b3e
Former-commit-id: 3c5ca0546f [formerly e3db522be4]
Former-commit-id: bb5553abb1
2013-03-05 09:10:52 -06:00
Richard Peter
fa19a76a42 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: e74f6074e7 [formerly 070f62d08e] [formerly e74f6074e7 [formerly 070f62d08e] [formerly 784cd2145f [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]
Former-commit-id: 784cd2145f
Former-commit-id: a4bf42628a [formerly 180540eb47]
Former-commit-id: 6b08735982
2013-03-04 17:48:05 -06:00
Dave Hladky
ac69f97305 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 22ebfe0ecb [formerly 680317d9c4] [formerly 22ebfe0ecb [formerly 680317d9c4] [formerly fc36146f48 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]
Former-commit-id: fc36146f48
Former-commit-id: 0f3c9ba997 [formerly 1260b40307]
Former-commit-id: fc90d47619
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
94b6f646b3 Issue #1628 move xmx settings to linux so windows can override.
Former-commit-id: 5a88604ed6 [formerly fad56e32cc] [formerly 5a88604ed6 [formerly fad56e32cc] [formerly c1c5ac7926 [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]]
Former-commit-id: c1c5ac7926
Former-commit-id: c99a17709e [formerly b16399cfdb]
Former-commit-id: c631b538e7
2013-03-04 16:47:11 -06:00
Nate Jensen
4c7d7bb7b9 Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
Former-commit-id: 5d772a2228 [formerly 0542f04538] [formerly 5d772a2228 [formerly 0542f04538] [formerly 773b39548d [formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]]
Former-commit-id: 773b39548d
Former-commit-id: e15d933ffb [formerly aaac07f26c]
Former-commit-id: 4bc3496636
2013-03-04 12:28:19 -06:00
Matt Nash
bad1cef443 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 311ac710ca [formerly fdc6db0a50] [formerly 311ac710ca [formerly fdc6db0a50] [formerly 1d25736871 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]
Former-commit-id: 1d25736871
Former-commit-id: 739a4ac2db [formerly 274becd212]
Former-commit-id: f02246ab07
2013-03-04 09:41:11 -06:00
Ron Anderson
45e3384b2f Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8

Former-commit-id: f1d5ff7c9e [formerly fdeb45705b] [formerly f1d5ff7c9e [formerly fdeb45705b] [formerly e8f1b460ce [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]
Former-commit-id: e8f1b460ce
Former-commit-id: fd86a481a7 [formerly 78a8d8f1a1]
Former-commit-id: 51d7975583
2013-03-04 09:30:04 -06:00
Richard Peter
80eafa9676 Issue #1740: Baseline cave monitoring script
Former-commit-id: 1632bd2882 [formerly 163fb343de] [formerly 1632bd2882 [formerly 163fb343de] [formerly 783e9c1a25 [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]]
Former-commit-id: 783e9c1a25
Former-commit-id: e00d5344b1 [formerly 94d804a301]
Former-commit-id: 9c63bea9d2
2013-03-01 16:17:25 -06:00
Ben Steffensmeier
c28a151884 Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: b0870c55f6 [formerly 86b9a4d8c2] [formerly b0870c55f6 [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]
Former-commit-id: 9263ff1846
Former-commit-id: 8f4c2f2a39 [formerly 5a149c5dfa]
Former-commit-id: 77aef5f955
2013-03-01 11:03:11 -06:00
Nate Jensen
65ae433077 Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: 308de6885f [formerly d695473b0f] [formerly 308de6885f [formerly d695473b0f] [formerly 302e851b67 [formerly 94e54241b7e85c523e019603cd9e815c179dc584]]]
Former-commit-id: 302e851b67
Former-commit-id: a7cc38e3ba [formerly 0d0dfb474f]
Former-commit-id: d03d447447
2013-03-01 10:15:46 -06:00
Ben Steffensmeier
12ce3faeb1 Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
Former-commit-id: 74296b32db [formerly df38a21e11] [formerly 74296b32db [formerly df38a21e11] [formerly aaffde9bf5 [formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]]
Former-commit-id: aaffde9bf5
Former-commit-id: f49b8cec68 [formerly 453723dc9d]
Former-commit-id: dbb965cf9d
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
bec51951ec Issue #1731 Remove unneccessary query in getDataStore.
Former-commit-id: 61875750c1 [formerly 52a64eda01] [formerly 61875750c1 [formerly 52a64eda01] [formerly 38728f3073 [formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]]
Former-commit-id: 38728f3073
Former-commit-id: 4bdd2946ee [formerly 586438b393]
Former-commit-id: 303c30040d
2013-02-28 13:59:02 -06:00
Richard Peter
014bf4250b Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
Former-commit-id: 2950dc9c42 [formerly 1ce1fb213b] [formerly 2950dc9c42 [formerly 1ce1fb213b] [formerly a9ffc8b170 [formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]]
Former-commit-id: a9ffc8b170
Former-commit-id: 7adde5c3aa [formerly c0e0a44e5f]
Former-commit-id: 93494fcea0
2013-02-27 16:16:09 -06:00
Richard Peter
7585176f50 Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
Former-commit-id: 7c1c44c22f [formerly 6535c1b6c7] [formerly 7c1c44c22f [formerly 6535c1b6c7] [formerly 656d9d74ae [formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]]
Former-commit-id: 656d9d74ae
Former-commit-id: b3c0f56954 [formerly ba4a86de16]
Former-commit-id: 706ec91548
2013-02-27 14:46:49 -06:00
Ron Anderson
6322f61325 Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8

Former-commit-id: f491d7f7c3 [formerly c9ca7a2943] [formerly f491d7f7c3 [formerly c9ca7a2943] [formerly 079cdbcb29 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]]
Former-commit-id: 079cdbcb29
Former-commit-id: b2bffcf0de [formerly a5195e137e]
Former-commit-id: ad73782c8b
2013-02-27 14:45:30 -06:00
Ben Steffensmeier
3a3f083a15 Issue #1659 Add time agnostic caching to grid derived parameters
Change-Id: I59db267004a7acd51642c4360404e96d50378480

Former-commit-id: ebfedad360 [formerly db1028ee7a] [formerly ebfedad360 [formerly db1028ee7a] [formerly 6d85856e60 [formerly 9685d0b363f21afbb42df02e9871884123d75e2c]]]
Former-commit-id: 6d85856e60
Former-commit-id: 0b2373ab4d [formerly 8112f669b3]
Former-commit-id: bbf4ced67d
2013-02-27 12:37:14 -06:00
Ron Anderson
cb2ec02843 Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27

Former-commit-id: 50f5e44b39 [formerly 36be1c5850] [formerly 50f5e44b39 [formerly 36be1c5850] [formerly c35e06d82c [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]]
Former-commit-id: c35e06d82c
Former-commit-id: e240568bb9 [formerly 5bd0dbcfca]
Former-commit-id: d75331a5c9
2013-02-27 12:34:40 -06:00
Ron Anderson
48abd41c6e Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a

Former-commit-id: 2212f333a3 [formerly a5a273c1c2] [formerly 2212f333a3 [formerly a5a273c1c2] [formerly 274ce762d8 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]]
Former-commit-id: 274ce762d8
Former-commit-id: 93382aeed8 [formerly 84bd642290]
Former-commit-id: 36f44524d0
2013-02-26 19:00:56 -06:00
Ron Anderson
59c7ee5120 Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: 541557e0b0 [formerly 77fbbb6a61]
Former-commit-id: 92abcad349
2013-02-26 18:44:51 -06:00
Dustin Johnson
6bb570ce5c Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 8038b840d8 [formerly 7852f88352] [formerly 8038b840d8 [formerly 7852f88352] [formerly 88a9b953b6 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]
Former-commit-id: 88a9b953b6
Former-commit-id: 94300e0c1d [formerly cc0254ba03]
Former-commit-id: 2d6df74b67
2013-02-26 15:06:04 -06:00
Lee Venable
1dff036c6a Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development
Former-commit-id: a4b41e0309 [formerly 9cf3ca07b7] [formerly a4b41e0309 [formerly 9cf3ca07b7] [formerly 46ff81108a [formerly 26fa358838588643c003287d8125e58949c3648f]]]
Former-commit-id: 46ff81108a
Former-commit-id: 4212af7e8a [formerly cb7fd87715]
Former-commit-id: 7b9ed39534
2013-02-26 14:11:35 -06:00
Mike Duff
a62b8b824e Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff

Former-commit-id: fdd5e903c6 [formerly b48e70fff4] [formerly fdd5e903c6 [formerly b48e70fff4] [formerly c77602652e [formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]]]
Former-commit-id: c77602652e
Former-commit-id: 882c46dd85 [formerly 3071eb8456]
Former-commit-id: bb240a10db
2013-02-26 14:03:55 -06:00
Nate Jensen
66e2da8c31 Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
Former-commit-id: f5ebeb1330 [formerly 1e50b3a0e8] [formerly f5ebeb1330 [formerly 1e50b3a0e8] [formerly 4e60fa682d [formerly 698d1d88b5c67498046dcec558361797a01b07f5]]]
Former-commit-id: 4e60fa682d
Former-commit-id: 2b81ce6028 [formerly e1660e51f8]
Former-commit-id: eced16c428
2013-02-26 13:46:30 -06:00
Dustin Johnson
7b73dbc256 Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
Former-commit-id: 074fb0aa64 [formerly 47cb278c01] [formerly 074fb0aa64 [formerly 47cb278c01] [formerly d31392d740 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]]]
Former-commit-id: d31392d740
Former-commit-id: 8e4a990d1a [formerly a7d4b23597]
Former-commit-id: abf85b6b0e
2013-02-26 13:41:46 -06:00
Dustin Johnson
7bc8125917 Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
Former-commit-id: 3dd36d29cf [formerly fb38cceecd] [formerly 3dd36d29cf [formerly fb38cceecd] [formerly 76738dbf7d [formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]]
Former-commit-id: 76738dbf7d
Former-commit-id: bb5f6cc568 [formerly b77ebdc924]
Former-commit-id: 77f811d090
2013-02-26 13:37:14 -06:00