Commit graph

2141 commits

Author SHA1 Message Date
Steve Harris
2cbd2a1bc9 Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: dc419068f0
Former-commit-id: 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]
Former-commit-id: f4e26fd94d
2013-03-20 16:06:20 -05:00
Steve Harris
dbeb388d72 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]
Former-commit-id: e9f0328808
2013-03-20 15:53:01 -05:00
Richard Peter
8805c42d14 Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: 0d35db042e [formerly d1e37c7803] [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 3b8e2ff0d3 [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 377061882220d7ca7878a9f6095ebe2307dd7ab4 [formerly 3bad342dca]
Former-commit-id: 53d8ef7ed1
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
d67d0ec674 Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: 41372ac122 [formerly 1203b7cee4] [formerly ee7204c05c] [formerly 82499f839d [formerly ee7204c05c [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]
Former-commit-id: 82499f839d
Former-commit-id: 048a16f2b52da3414fc5d576059d5543b43f69f9 [formerly 3e2a41d1d2]
Former-commit-id: 1b363a547c
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
4b0e7e77d3 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]
Former-commit-id: ed544fc17c
Former-commit-id: b850b70906a6763277fa77ce5a2f3e638139e35a [formerly 646b61f653]
Former-commit-id: b201d9dee2
2013-03-20 13:05:54 -05:00
Dave Hladky
a7462a5125 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: d8061685e48c132d552a31fbc1071360f10159ed [formerly bd17b99bd1]
Former-commit-id: 01c6ff12a0
2013-03-20 12:41:33 -05:00
David Gillingham
173ceacc0d Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434.
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9

Former-commit-id: 3ad6035189 [formerly ab6944650a] [formerly 843f474af8] [formerly 8ea6d7227b [formerly 843f474af8 [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]]
Former-commit-id: 8ea6d7227b
Former-commit-id: 15ae015d4e8d837d34c8ef660c79da6b2290ef2d [formerly 5f8c8a80f8]
Former-commit-id: a8ed519915
2013-03-19 16:06:25 -05:00
Richard Peter
95ff197f23 Merge "Issue #1804 Cache db queries in radar decoder. Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be" into omaha_13.3.1
Former-commit-id: 7d0568efed [formerly 26aa93a6f4] [formerly 6046872ab5] [formerly a421cfe73e [formerly 6046872ab5 [formerly d17f8b4df74b52f703636d253c25aa4db73dfc6d]]]
Former-commit-id: a421cfe73e
Former-commit-id: 191d5afdb7ad56b19e338caa367d0135343f7c82 [formerly cf395cfb39]
Former-commit-id: 845a04fd54
2013-03-19 15:34:36 -05:00
Steve Harris
3c492badbc 13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]
Former-commit-id: 7e96d841d9
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
0c1fe3d11f Issue #1804 Cache db queries in radar decoder.
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: f828c49328 [formerly 337e450f94] [formerly 7b83f6bdfa] [formerly 5d2d834cf7 [formerly 7b83f6bdfa [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]]
Former-commit-id: 5d2d834cf7
Former-commit-id: 6c97a1e140c30a4f6f7ccde142ee0a06b355c751 [formerly ff0e5696e8]
Former-commit-id: 489a180622
2013-03-19 14:11:36 -05:00
Richard Peter
26e2d62e99 Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 47a74b9867 [formerly 2fdbc96342] [formerly 4ce10bced9] [formerly 3a92747518 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]]
Former-commit-id: 3a92747518
Former-commit-id: 7532765e0a4316f68ebd2971adf3566334c5a08c [formerly c955b3b640]
Former-commit-id: eebd930070
2013-03-19 13:24:28 -05:00
Mike Duff
e205993cba Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 361434a64f [formerly 70efff8f0a] [formerly 5c76f2ebae6e51589fb570fe3c25d5a3d3b57560 [formerly b115d3611c]] [formerly 058064ce0d [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]
Former-commit-id: 058064ce0d
Former-commit-id: f1784284db525c1ae3413ff04b935577969880b1 [formerly 7e66c8e46d]
Former-commit-id: 3e1b4ba54b
2013-03-19 10:10:01 -05:00
Ben Steffensmeier
89ec3e9ce7 Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: be721b7da0 [formerly 7b7b708eee] [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]
Former-commit-id: 86dffab17d
Former-commit-id: 3a15f3575a0d243b59b8d728d08f437b3b036330 [formerly dfe8de96f2]
Former-commit-id: 160b6a7040
2013-03-18 17:16:44 -05:00
Steve Harris
0e9919f6be 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: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]
Former-commit-id: ea27f9cd17
2013-03-18 16:43:22 -05:00
Steve Harris
2fd4ac9397 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]
Former-commit-id: 81a3f29afc
2013-03-18 15:43:32 -05:00
Nate Jensen
568f988ef9 Issue #1795 speed up publish by optimizing publish time updates in grid histories
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: 3b331be9f6 [formerly 30ddd909bf] [formerly 827d546debc5772bc4391f020a12a353ee05f1e9 [formerly e65267d5f3]] [formerly 235952a115 [formerly e65267d5f3 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]]
Former-commit-id: 235952a115
Former-commit-id: 322940c9800f51152a2cd23a4f14a10dee589147 [formerly dad08657aa]
Former-commit-id: 4ea1508baa
2013-03-15 16:10:11 -05:00
Lee Venable
a0298d4199 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: a1ea0d020c [formerly 57d7559797] [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 456fd056f4 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]
Former-commit-id: 93e99b64a6
Former-commit-id: db8baa1a7f8057094afd75e9aeaf6f46c5dd6820 [formerly 3a1dc41b50]
Former-commit-id: ba4673b99a
2013-03-14 17:19:38 -05:00
Dave Hladky
19117f1851 Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

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

Former-commit-id: 3f0030521d [formerly 7335a2336e] [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 7aa8b2d3eb [formerly 055873318a368301fc966501b27001f5ace0bcae]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 628065abbf3e3e03dedca4f091459d9085169d1c [formerly 364d6fd9ee]
Former-commit-id: e5b9e0ca46
2013-03-14 13:26:08 -05:00
Greg Armendariz
ef59159bb9 Removed merge code from the source code
Former-commit-id: 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 5511f0b3a6 [formerly 9652fe27ae424cba83296a714a720e554390550a]]]
Former-commit-id: 2f9136843b
Former-commit-id: 486130740373c00d6c7a8808665421ce577a9b77 [formerly 3a3486b0b7]
Former-commit-id: b79ecc28e3
2013-03-14 11:15:08 -05:00
Ben Steffensmeier
964fc25677 Issue #1777 fix subgridding range problems
Former-commit-id: 81f4bb55fc [formerly 5e81f2154d] [formerly 5bd20414eb] [formerly 0daa5817d0 [formerly 5bd20414eb [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]]
Former-commit-id: 0daa5817d0
Former-commit-id: 3bef982b8d104b6bd033477b34c99e0da65ce9ad [formerly a6140145a4]
Former-commit-id: d22cbc7ce9
2013-03-14 09:56:00 -05:00
Nate Jensen
b74d6315a6 Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 14da2b6cc3 [formerly 9dbb7660a7] [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 29b4cd2fb5 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]
Former-commit-id: 490ffe2772
Former-commit-id: bb1674d56d5f72528a3f2eb6ea51452dfd9a36b1 [formerly a933532ad9]
Former-commit-id: e2e9a845d5
2013-03-14 09:48:16 -05:00
Ben Steffensmeier
a440445437 Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]
Former-commit-id: 52c167cf00
Former-commit-id: 48609b58bd2286f625bd7a23b14b9741685a71df [formerly 8f6a7c0746]
Former-commit-id: 2d622e6053
2013-03-13 18:52:52 -05:00
Ron Anderson
87cd340e38 Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: f9c7fa9613 [formerly 0c881b4a85] [formerly 3b65608373] [formerly 61f74305e2 [formerly 3b65608373 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 61f74305e2
Former-commit-id: f55bb3e367547583c32d5cc1463941491ec9c6b6 [formerly a7b6e1689b]
Former-commit-id: de14cd0baa
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
7e998aa197 Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 89eb902284
Former-commit-id: 10a52ad4fbe4cb9ea324302c2ac6a32c3b3fad23 [formerly 7abf3cfb39]
Former-commit-id: f5680beaa9
2013-03-13 17:09:20 -05:00
Nate Jensen
d7696aa692 Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
Former-commit-id: 4db98f508d [formerly d0db96df45] [formerly dbd2729336] [formerly eaef235e8e [formerly dbd2729336 [formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]
Former-commit-id: eaef235e8e
Former-commit-id: 2d26b66cf912a53b86fda6b7e210470e522c1cbe [formerly d881ab1442]
Former-commit-id: 15b3d5add6
2013-03-13 16:17:44 -05:00
Dave Hladky
68114535f2 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]
Former-commit-id: 9e97fc9efe
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
6e0c60c210 Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
Former-commit-id: 45cf2fd0ff [formerly 51955a719a] [formerly 36b3c16a42] [formerly ddf2092bde [formerly 36b3c16a42 [formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]]
Former-commit-id: ddf2092bde
Former-commit-id: 9ff9ba942dcb40894a6b2a25b30b686d76272ff6 [formerly 247c9f6c1f]
Former-commit-id: a1ca2ae2d7
2013-03-13 13:21:16 -05:00
Steve Harris
45a2d0501d 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]
Former-commit-id: ed5f1dbab6
2013-03-13 09:50:28 -05:00
Steve Harris
f92bc8f3d4 13.3.1-6.1 baseline
Former-commit-id: 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]
Former-commit-id: a062803c8c
Former-commit-id: 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330]
Former-commit-id: 2e1dbdc10d
2013-03-13 08:28:26 -05:00
Roger Ferrel
b2845a11d0 Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4

Former-commit-id: 82b526851a [formerly f912d9ece3] [formerly c5a2786c84] [formerly b5743e8f9b [formerly c5a2786c84 [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]]
Former-commit-id: b5743e8f9b
Former-commit-id: b8373ea3e1f95cfdea39442e15da79444813af3c [formerly 8bb9044e3a]
Former-commit-id: a9a0a471f9
2013-03-12 16:58:06 -05:00
Dave Hladky
eefd544e4b 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: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]
Former-commit-id: 155903d135
2013-03-12 15:48:34 -05:00
Lee Venable
da5ff93f57 Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 13d13428b7 [formerly 9a69cd3524] [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]
Former-commit-id: 28d74d91b0
Former-commit-id: 6cbbc7b35f1af06bc44a23c6f7846a7c829b25b7 [formerly e080fb5106]
Former-commit-id: b471e3807f
2013-03-12 09:08:44 -05:00
Mike Duff
848f7982d6 Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 5704b2689e [formerly 492cf0f7e6] [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]
Former-commit-id: cac9bd6119
Former-commit-id: b852cff98c7943089d4fa9240397aef285faa297 [formerly caed059e23]
Former-commit-id: 2df046d409
2013-03-12 09:03:08 -05:00
Steve Harris
0cec06c171 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]
Former-commit-id: 6fe4b16924
2013-03-12 08:35:45 -05:00
Roger Ferrel
7c6bd5aeb0 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: 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57]
Former-commit-id: 0deb290c24
2013-03-11 13:00:44 -05:00
Lee Venable
ec43f5c022 Merge "Issue #1769 Crashing FFMP caused by thread wait" into omaha_13.3.1
Former-commit-id: ed477e891e [formerly 483e2813ac] [formerly ea6731947e] [formerly 41c7be5267 [formerly ea6731947e [formerly 784852cf5045a32f94ba1923e9fadcd952d45dbb]]]
Former-commit-id: 41c7be5267
Former-commit-id: 3c83441ba78cd8de0509b446bbd7dc77463041fe [formerly 32221a7a7a]
Former-commit-id: be87f2adc3
2013-03-08 13:04:28 -06:00
Dave Hladky
f3c5756522 Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: b064d868db [formerly 50696bee89] [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]
Former-commit-id: bb4c54eff0
Former-commit-id: 0d693e1163a146ba4b75d08a7448f53b6d3a905b [formerly 73c21a6ead]
Former-commit-id: dd446abd03
2013-03-08 09:58:17 -06:00
Nate Jensen
5f343a50ae Issue #1773 log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 8a5ebbb9c9 [formerly 5d9778a8d6] [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 5e3d6df7e0 [formerly 392feade3f36680edcdb135f7c061be172210c26]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 5effcf2be10b9fa355b692253b6dde537d5459c4 [formerly d7902aba68]
Former-commit-id: 21863c5db5
2013-03-07 16:49:40 -06:00
David Gillingham
266c316c9c Issue #1447: Implement active table fetching, make bug fixes
to active table sharing from testing.

Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d

Former-commit-id: c30aefd889 [formerly 75e82d9fca] [formerly 95f8074c97] [formerly 0a79d08dd8 [formerly 95f8074c97 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 34ef93fbfd1261df01dfa61865a606e7d9a7141f [formerly 5ad72e2a7f]
Former-commit-id: 94bccc87a3
2013-03-06 14:23:00 -06:00
Nate Jensen
97172b7466 Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

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

Former-commit-id: edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly 6a3281c878 [formerly 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]]
Former-commit-id: 6a3281c878
Former-commit-id: 3d49dc5085631dccfa4591b739f0f1e02b09ecee [formerly c2b021427b]
Former-commit-id: 234d73c905
2013-03-05 16:02:47 -06:00
Dustin Johnson
513f990a00 Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
Former-commit-id: cfae194f9b [formerly 21abece1f2] [formerly d4c6c29f5f] [formerly 3eddb2d286 [formerly d4c6c29f5f [formerly 6fd60728a421630cea913d11db02b48f7940554e]]]
Former-commit-id: 3eddb2d286
Former-commit-id: 0344c84d1e8fbcb57eb5b9ad89e040c20ba5273c [formerly bfed4555a2]
Former-commit-id: b88a1eefc1
2013-03-05 13:32:04 -06:00
Steve Harris
7ff64bf8cc Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]
Former-commit-id: b423579e4a
2013-03-05 12:27:49 -06:00
Mike Duff
e71d15f640 Issue #1752 - Lock down user admin dialog
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb

Former-commit-id: ec9f3ea4a1 [formerly 9d99eea617] [formerly 6809cb6f80] [formerly 193cf1e54f [formerly 6809cb6f80 [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]]
Former-commit-id: 193cf1e54f
Former-commit-id: 88e4de072ccfa6a5ea0a83518e7661b27952c198 [formerly 775a0e3edd]
Former-commit-id: af84910ac6
2013-03-05 11:26:54 -06:00
Steve Harris
aabd5cd51f 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]
Former-commit-id: a240379588
2013-03-05 10:47:06 -06:00
Steve Harris
4bfbb518c0 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]
Former-commit-id: 3e0614b43a
2013-03-05 10:39:59 -06:00
Nate Jensen
790eb9ef79 Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: d7bc5750ae [formerly b393674ef3] [formerly b803ae3801] [formerly a952d48b3e [formerly b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]]
Former-commit-id: a952d48b3e
Former-commit-id: a901506e2ccdd1f021aa7b64beb4727c4a3b7241 [formerly e3db522be4]
Former-commit-id: 3c5ca0546f
2013-03-05 09:10:52 -06:00
Richard Peter
c7a4dcede6 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]
Former-commit-id: 784cd2145f
Former-commit-id: 63aff6583f8761a1de816d6c0659c2736bd51159 [formerly 180540eb47]
Former-commit-id: a4bf42628a
2013-03-04 17:48:05 -06:00