Greg Armendariz
|
166fcb78a9
|
Removed merge code from the source code
Former-commit-id: 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 5511f0b3a6 [formerly 9652fe27ae424cba83296a714a720e554390550a]]]]
Former-commit-id: 2f9136843b
Former-commit-id: ef59159bb9 [formerly b79ecc28e3] [formerly 486130740373c00d6c7a8808665421ce577a9b77 [formerly 3a3486b0b7]]
Former-commit-id: 0fe252f9bf5b69a3471bb0b71197934ca6b0d155 [formerly 8ea2042456]
Former-commit-id: cfc53af85e
|
2013-03-14 11:15:08 -05:00 |
|
Ben Steffensmeier
|
d74ac3e7f7
|
Issue #1777 fix subgridding range problems
Former-commit-id: 81f4bb55fc [formerly 5e81f2154d] [formerly 5bd20414eb] [formerly 81f4bb55fc [formerly 5e81f2154d] [formerly 5bd20414eb] [formerly 0daa5817d0 [formerly 5bd20414eb [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]]]
Former-commit-id: 0daa5817d0
Former-commit-id: 964fc25677 [formerly d22cbc7ce9] [formerly 3bef982b8d104b6bd033477b34c99e0da65ce9ad [formerly a6140145a4]]
Former-commit-id: cf39e0dc082aed64da92558a4c063831fc9ebdb9 [formerly bc92e1be6b]
Former-commit-id: 24b97d7625
|
2013-03-14 09:56:00 -05:00 |
|
Nate Jensen
|
f046b23f9b
|
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 14da2b6cc3 [formerly 9dbb7660a7] [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 29b4cd2fb5 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]]
Former-commit-id: 490ffe2772
Former-commit-id: b74d6315a6 [formerly e2e9a845d5] [formerly bb1674d56d5f72528a3f2eb6ea51452dfd9a36b1 [formerly a933532ad9]]
Former-commit-id: 75207b52738316a6767eb046282fd34cc9c6c47c [formerly 363efaec00]
Former-commit-id: c710def06d
|
2013-03-14 09:48:16 -05:00 |
|
Ben Steffensmeier
|
6b3e6e703b
|
Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]]
Former-commit-id: 52c167cf00
Former-commit-id: a440445437 [formerly 2d622e6053] [formerly 48609b58bd2286f625bd7a23b14b9741685a71df [formerly 8f6a7c0746]]
Former-commit-id: e54de36cfb829c41843de14a87917d4b35e60c55 [formerly 60bb04a055]
Former-commit-id: 7266a995f9
|
2013-03-13 18:52:52 -05:00 |
|
Ron Anderson
|
86d85d75e8
|
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 f9c7fa9613 [formerly 0c881b4a85] [formerly 3b65608373] [formerly 61f74305e2 [formerly 3b65608373 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]]
Former-commit-id: 61f74305e2
Former-commit-id: 87cd340e38 [formerly de14cd0baa] [formerly f55bb3e367547583c32d5cc1463941491ec9c6b6 [formerly a7b6e1689b]]
Former-commit-id: 4487e4817e53af625104ab94ce05c0bd8071ba49 [formerly b1088415cd]
Former-commit-id: 39e2d27a89
|
2013-03-13 17:16:37 -05:00 |
|
Ben Steffensmeier
|
1f4315a7ed
|
Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]]
Former-commit-id: 89eb902284
Former-commit-id: 7e998aa197 [formerly f5680beaa9] [formerly 10a52ad4fbe4cb9ea324302c2ac6a32c3b3fad23 [formerly 7abf3cfb39]]
Former-commit-id: f38c474fb547944154f869716e7a195f17c008a5 [formerly 6d699f7713]
Former-commit-id: f012dd8b0a
|
2013-03-13 17:09:20 -05:00 |
|
Nate Jensen
|
f981b7b9b1
|
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 4db98f508d [formerly d0db96df45] [formerly dbd2729336] [formerly eaef235e8e [formerly dbd2729336 [formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]]
Former-commit-id: eaef235e8e
Former-commit-id: d7696aa692 [formerly 15b3d5add6] [formerly 2d26b66cf912a53b86fda6b7e210470e522c1cbe [formerly d881ab1442]]
Former-commit-id: 5e309f9fa3e25596f11809c78831943947e408ed [formerly 4539ef8b58]
Former-commit-id: 165fbf3646
|
2013-03-13 16:17:44 -05:00 |
|
Dave Hladky
|
b111edeb8b
|
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2 [formerly 9e97fc9efe] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8]
Former-commit-id: b85e19282b
|
2013-03-13 13:56:33 -05:00 |
|
Ben Steffensmeier
|
f5d83f4c32
|
Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
Former-commit-id: 45cf2fd0ff [formerly 51955a719a] [formerly 36b3c16a42] [formerly 45cf2fd0ff [formerly 51955a719a] [formerly 36b3c16a42] [formerly ddf2092bde [formerly 36b3c16a42 [formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]]]
Former-commit-id: ddf2092bde
Former-commit-id: 6e0c60c210 [formerly a1ca2ae2d7] [formerly 9ff9ba942dcb40894a6b2a25b30b686d76272ff6 [formerly 247c9f6c1f]]
Former-commit-id: a9c09f254baa3c3e3c8f54b1f737da4393b40042 [formerly 04882c798f]
Former-commit-id: 15a16c8d81
|
2013-03-13 13:21:16 -05:00 |
|
Steve Harris
|
352658125b
|
13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
3b10c0e0b7
|
13.3.1-6.1 baseline
Former-commit-id: 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]]
Former-commit-id: a062803c8c
Former-commit-id: f92bc8f3d4 [formerly 2e1dbdc10d] [formerly 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330]]
Former-commit-id: c57d4dca8ae0fdf1532461d5c287fa8b8cb94434 [formerly c038384685]
Former-commit-id: a5b96e0c3c
|
2013-03-13 08:28:26 -05:00 |
|
Roger Ferrel
|
cef241d8f8
|
Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4
Former-commit-id: 82b526851a [formerly f912d9ece3] [formerly c5a2786c84] [formerly 82b526851a [formerly f912d9ece3] [formerly c5a2786c84] [formerly b5743e8f9b [formerly c5a2786c84 [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]]]
Former-commit-id: b5743e8f9b
Former-commit-id: b2845a11d0 [formerly a9a0a471f9] [formerly b8373ea3e1f95cfdea39442e15da79444813af3c [formerly 8bb9044e3a]]
Former-commit-id: a992232e6a449b734a792e862f3d7cf15e059841 [formerly 5546691fd6]
Former-commit-id: cf7b0e99f7
|
2013-03-12 16:58:06 -05:00 |
|
Dave Hladky
|
87992329b4
|
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 e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b [formerly 155903d135] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13]
Former-commit-id: cdfbcc7136
|
2013-03-12 15:48:34 -05:00 |
|
Lee Venable
|
514a102281
|
Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 13d13428b7 [formerly 9a69cd3524] [formerly d5af1f02c5] [formerly 13d13428b7 [formerly 9a69cd3524] [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]]
Former-commit-id: 28d74d91b0
Former-commit-id: da5ff93f57 [formerly b471e3807f] [formerly 6cbbc7b35f1af06bc44a23c6f7846a7c829b25b7 [formerly e080fb5106]]
Former-commit-id: 32365b9858d2738c4e5f0d906fdad1561c7cc170 [formerly b0e9ea9157]
Former-commit-id: ca95cb0fce
|
2013-03-12 09:08:44 -05:00 |
|
Mike Duff
|
d69f849739
|
Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d
Former-commit-id: 5704b2689e [formerly 492cf0f7e6] [formerly 6a6844fdaf] [formerly 5704b2689e [formerly 492cf0f7e6] [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]]
Former-commit-id: cac9bd6119
Former-commit-id: 848f7982d6 [formerly 2df046d409] [formerly b852cff98c7943089d4fa9240397aef285faa297 [formerly caed059e23]]
Former-commit-id: 5c6d69dbb036423dd0841051c987f711a3b18320 [formerly 659a2a4f4c]
Former-commit-id: 3eef80b3d1
|
2013-03-12 09:03:08 -05:00 |
|
Steve Harris
|
ed1788343e
|
13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
|
2013-03-12 08:35:45 -05:00 |
|
Roger Ferrel
|
590ef32dcb
|
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 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]]
Former-commit-id: b421c97d86
Former-commit-id: 7c6bd5aeb0 [formerly 0deb290c24] [formerly bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57]]
Former-commit-id: 67c6f245a3e7e1a735bd5bfb5bb69221fe9e622b [formerly 0bbe51355e]
Former-commit-id: 241dfb9451
|
2013-03-11 13:00:44 -05:00 |
|
Lee Venable
|
9ca8522cb6
|
Merge "Issue #1769 Crashing FFMP caused by thread wait" into omaha_13.3.1
Former-commit-id: ed477e891e [formerly 483e2813ac] [formerly ea6731947e] [formerly ed477e891e [formerly 483e2813ac] [formerly ea6731947e] [formerly 41c7be5267 [formerly ea6731947e [formerly 784852cf5045a32f94ba1923e9fadcd952d45dbb]]]]
Former-commit-id: 41c7be5267
Former-commit-id: ec43f5c022 [formerly be87f2adc3] [formerly 3c83441ba78cd8de0509b446bbd7dc77463041fe [formerly 32221a7a7a]]
Former-commit-id: 87ebea077e5297b6128366d2b0766faf4274c391 [formerly 330f2e0dd7]
Former-commit-id: 8feb08beec
|
2013-03-08 13:04:28 -06:00 |
|
Dave Hladky
|
b2fd11f9ba
|
Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611
Former-commit-id: b064d868db [formerly 50696bee89] [formerly 2a854d7c30] [formerly b064d868db [formerly 50696bee89] [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]]
Former-commit-id: bb4c54eff0
Former-commit-id: f3c5756522 [formerly dd446abd03] [formerly 0d693e1163a146ba4b75d08a7448f53b6d3a905b [formerly 73c21a6ead]]
Former-commit-id: 35b46b23858ef8b9902cb3226539169a92f27a31 [formerly 6fe48593f0]
Former-commit-id: a24150df56
|
2013-03-08 09:58:17 -06:00 |
|
Nate Jensen
|
c3eee1d672
|
Issue #1773 log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 8a5ebbb9c9 [formerly 5d9778a8d6] [formerly 5e3d6df7e0] [formerly 8a5ebbb9c9 [formerly 5d9778a8d6] [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 5e3d6df7e0 [formerly 392feade3f36680edcdb135f7c061be172210c26]]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 5f343a50ae [formerly 21863c5db5] [formerly 5effcf2be10b9fa355b692253b6dde537d5459c4 [formerly d7902aba68]]
Former-commit-id: cee6519ae8def3eb8dd9176022e583ac56b8f782 [formerly a2f804350a]
Former-commit-id: d0bed867b0
|
2013-03-07 16:49:40 -06:00 |
|
David Gillingham
|
4310a7cf4c
|
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 c30aefd889 [formerly 75e82d9fca] [formerly 95f8074c97] [formerly 0a79d08dd8 [formerly 95f8074c97 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 266c316c9c [formerly 94bccc87a3] [formerly 34ef93fbfd1261df01dfa61865a606e7d9a7141f [formerly 5ad72e2a7f]]
Former-commit-id: 28bcfe11ee679ce82c9ad55130e0004161f87c56 [formerly 2ca8e5e42a]
Former-commit-id: a1029acb7c
|
2013-03-06 14:23:00 -06:00 |
|
Nate Jensen
|
68ad66710b
|
Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549
Former-commit-id: 2a34c5757a [formerly f101934a30] [formerly a7e9cfdb39] [formerly 2a34c5757a [formerly f101934a30] [formerly a7e9cfdb39] [formerly 163f93019b [formerly a7e9cfdb39 [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]]]
Former-commit-id: 163f93019b
Former-commit-id: 97172b7466 [formerly c4175c161f] [formerly 8af3fb81542f03f05402208a65fd3f1ea9cb1229 [formerly d6c3c84d30]]
Former-commit-id: 11c882caee37b0a404c2eafec38954769365f319 [formerly 63eb6e6d21]
Former-commit-id: 4a53109fb2
|
2013-03-06 09:36:00 -06:00 |
|
Jonathan Sanchez
|
b17c66eddc
|
Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly 6a3281c878 [formerly 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]]]
Former-commit-id: 6a3281c878
Former-commit-id: a5478559bc [formerly 234d73c905] [formerly 3d49dc5085631dccfa4591b739f0f1e02b09ecee [formerly c2b021427b]]
Former-commit-id: 20722369ae623501820dc3acb6a7289596f69a5b [formerly 1403713fab]
Former-commit-id: 852b61f7e1
|
2013-03-05 16:02:47 -06:00 |
|
Dustin Johnson
|
a0635b7972
|
Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
Former-commit-id: cfae194f9b [formerly 21abece1f2] [formerly d4c6c29f5f] [formerly cfae194f9b [formerly 21abece1f2] [formerly d4c6c29f5f] [formerly 3eddb2d286 [formerly d4c6c29f5f [formerly 6fd60728a421630cea913d11db02b48f7940554e]]]]
Former-commit-id: 3eddb2d286
Former-commit-id: 513f990a00 [formerly b88a1eefc1] [formerly 0344c84d1e8fbcb57eb5b9ad89e040c20ba5273c [formerly bfed4555a2]]
Former-commit-id: 2791098ecadf0bba6ab4f7ece1617303c52f766e [formerly f6431b52bf]
Former-commit-id: d28ff6d3c2
|
2013-03-05 13:32:04 -06:00 |
|
Steve Harris
|
2104c8b533
|
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc [formerly b423579e4a] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7]
Former-commit-id: d842ed88a7
|
2013-03-05 12:27:49 -06:00 |
|
Mike Duff
|
f82462f4a0
|
Issue #1752 - Lock down user admin dialog
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb
Former-commit-id: ec9f3ea4a1 [formerly 9d99eea617] [formerly 6809cb6f80] [formerly ec9f3ea4a1 [formerly 9d99eea617] [formerly 6809cb6f80] [formerly 193cf1e54f [formerly 6809cb6f80 [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]]]
Former-commit-id: 193cf1e54f
Former-commit-id: e71d15f640 [formerly af84910ac6] [formerly 88e4de072ccfa6a5ea0a83518e7661b27952c198 [formerly 775a0e3edd]]
Former-commit-id: 15970d6c6fe94c1254b7558008541bf4e76fa5b3 [formerly 78953a3fd7]
Former-commit-id: ffbc3e4b9f
|
2013-03-05 11:26:54 -06:00 |
|
Steve Harris
|
f20c87110e
|
13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f [formerly a240379588] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57]
Former-commit-id: 79ff805090
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
52aae101cc
|
13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]
Former-commit-id: 2edca90902
Former-commit-id: 4bfbb518c0 [formerly 3e0614b43a] [formerly c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]]
Former-commit-id: e4eaa93661df211ab065d6c9dd5f042f5011f151 [formerly 0df35cc5ec]
Former-commit-id: 153aadc1d7
|
2013-03-05 10:39:59 -06:00 |
|
Nate Jensen
|
645dce36ab
|
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 d7bc5750ae [formerly b393674ef3] [formerly b803ae3801] [formerly a952d48b3e [formerly b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]]]
Former-commit-id: a952d48b3e
Former-commit-id: 790eb9ef79 [formerly 3c5ca0546f] [formerly a901506e2ccdd1f021aa7b64beb4727c4a3b7241 [formerly e3db522be4]]
Former-commit-id: f3f69b1fabddb12a309c17a0dde94e92a62eb48f [formerly bb5553abb1]
Former-commit-id: 081284a2f8
|
2013-03-05 09:10:52 -06:00 |
|
Richard Peter
|
3ab85aa0f3
|
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 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]]
Former-commit-id: 784cd2145f
Former-commit-id: c7a4dcede6 [formerly a4bf42628a] [formerly 63aff6583f8761a1de816d6c0659c2736bd51159 [formerly 180540eb47]]
Former-commit-id: 1992cb2228c9c7acfe9a1445250fc5508b45c157 [formerly 6b08735982]
Former-commit-id: fa19a76a42
|
2013-03-04 17:48:05 -06:00 |
|
Dave Hladky
|
69e1b5f133
|
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly fc36146f48 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]]
Former-commit-id: fc36146f48
Former-commit-id: f47935a03c [formerly 0f3c9ba997] [formerly 88439cd2618a1c23c44807b5d72302de6137417a [formerly 1260b40307]]
Former-commit-id: d37acb68d5f6f91395fa98f52c09dffd4dcce861 [formerly fc90d47619]
Former-commit-id: ac69f97305
|
2013-03-04 17:41:11 -06:00 |
|
Ben Steffensmeier
|
35d841ce41
|
Issue #1628 move xmx settings to linux so windows can override.
Former-commit-id: 9a8b585720 [formerly 5a88604ed6] [formerly fad56e32cc] [formerly 9a8b585720 [formerly 5a88604ed6] [formerly fad56e32cc] [formerly c1c5ac7926 [formerly fad56e32cc [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]]]
Former-commit-id: c1c5ac7926
Former-commit-id: 3a92dd3b6d [formerly c99a17709e] [formerly c2221c67d2e2345aa9b44715379eafeb2a87f000 [formerly b16399cfdb]]
Former-commit-id: b84baab4f2996b50ad6459d4ff02ad81cb71bf9c [formerly c631b538e7]
Former-commit-id: 94b6f646b3
|
2013-03-04 16:47:11 -06:00 |
|
Steve Harris
|
7a487645a9
|
Issue #1744 - Revert "Issue #1744 fix deadlock"
This reverts commit 9654c80906 [formerly 46ceab84c1] [formerly 60ba73c04c032b29fe9de5d4eedf3cbfefe3e10c [formerly c990477402]] [formerly 91d577f4db [formerly c5600acf79] [formerly cea33e5e9d7f091f9ec47d746199097bf2783899 [formerly f7ffa22c7c]]] [formerly f4cccabc07] [formerly 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]]].
Former-commit-id: f14f5aeb48 [formerly 7ffb42d6e6] [formerly 28391884a7] [formerly f14f5aeb48 [formerly 7ffb42d6e6] [formerly 28391884a7] [formerly fcb48a7280 [formerly 28391884a7 [formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]]]
Former-commit-id: fcb48a7280
Former-commit-id: 8d3a082908 [formerly f70ff93d2c] [formerly b5f56d7e152dca42f3283ef75e9eb4904563dd94 [formerly 9e87721b85]]
Former-commit-id: 861bc95c7454b6c8b3b9f97daa3e8cc09433781b [formerly 5baddd4678]
Former-commit-id: 04d09aba00
|
2013-03-04 13:03:19 -06:00 |
|
Steve Harris
|
749d6a1b89
|
Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
This reverts commit 62e364213a [formerly 312e2e07ae] [formerly 5b126ce31b7b2161f0bb83ad5035f926557f9ab1 [formerly eec5f87ab2]] [formerly 49fc025594 [formerly 348f5f0f41] [formerly 713be7a0d247874d2807d3b5c3e1411449c3821e [formerly 33da766f63]]] [formerly 35007e0460] [formerly eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]]].
Former-commit-id: 702cec08bd [formerly 870972fb90] [formerly 88e633934d] [formerly 702cec08bd [formerly 870972fb90] [formerly 88e633934d] [formerly bba410a330 [formerly 88e633934d [formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]]]
Former-commit-id: bba410a330
Former-commit-id: 9eeda5c82e [formerly ee2452f5d3] [formerly 537868d2ef13d960b8aa433851e48e3b6ee200fc [formerly 7d2286aea7]]
Former-commit-id: c2b8b73a414ef9ca8693e92fba589e6afefd1e54 [formerly f92b1e3534]
Former-commit-id: b71436dba8
|
2013-03-04 13:02:32 -06:00 |
|
Nate Jensen
|
25422ac783
|
Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
Former-commit-id: f832e5949c [formerly 5d772a2228] [formerly 0542f04538] [formerly f832e5949c [formerly 5d772a2228] [formerly 0542f04538] [formerly 773b39548d [formerly 0542f04538 [formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]]]
Former-commit-id: 773b39548d
Former-commit-id: 300ec4fb40 [formerly e15d933ffb] [formerly 7ecaceea4b43ec1774bff495fb630d90c2281a3c [formerly aaac07f26c]]
Former-commit-id: 1af312afedb388d809c11d6cad5b5aaf71b22873 [formerly 4bc3496636]
Former-commit-id: 4c7d7bb7b9
|
2013-03-04 12:28:19 -06:00 |
|
Matt Nash
|
a12055eff6
|
Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293
Former-commit-id: 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 1d25736871 [formerly fdc6db0a50 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]]
Former-commit-id: 1d25736871
Former-commit-id: b0a0086da1 [formerly 739a4ac2db] [formerly 04b14b2dd0b28e80f7bd47e6d8aa7a5e1bb12a5f [formerly 274becd212]]
Former-commit-id: 2008f23e609dbfef312c46bbc800643d207b4fab [formerly f02246ab07]
Former-commit-id: bad1cef443
|
2013-03-04 09:41:11 -06:00 |
|
Ron Anderson
|
ea3fea38dd
|
Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8
Former-commit-id: 3aba636666 [formerly f1d5ff7c9e] [formerly fdeb45705b] [formerly 3aba636666 [formerly f1d5ff7c9e] [formerly fdeb45705b] [formerly e8f1b460ce [formerly fdeb45705b [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]]
Former-commit-id: e8f1b460ce
Former-commit-id: 29cf2d6ddd [formerly fd86a481a7] [formerly 96dbec8a7d73075e3bd577828a3e622bb4ad9fbb [formerly 78a8d8f1a1]]
Former-commit-id: f7815b2071f640cadd3abe08a63c67a8804c1c11 [formerly 51d7975583]
Former-commit-id: 45e3384b2f
|
2013-03-04 09:30:04 -06:00 |
|
Richard Peter
|
2eb3dcec5e
|
Issue #1740: Baseline cave monitoring script
Former-commit-id: e54d4ba855 [formerly 1632bd2882] [formerly 163fb343de] [formerly e54d4ba855 [formerly 1632bd2882] [formerly 163fb343de] [formerly 783e9c1a25 [formerly 163fb343de [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]]]
Former-commit-id: 783e9c1a25
Former-commit-id: dd03372823 [formerly e00d5344b1] [formerly a89d3bf559e31d9b30dc0a377f40e68385713756 [formerly 94d804a301]]
Former-commit-id: b03f7055bcdd495f2fa8cef70e67b8096a4ddb4a [formerly 9c63bea9d2]
Former-commit-id: 80eafa9676
|
2013-03-01 16:17:25 -06:00 |
|
Nate Jensen
|
ccc125751d
|
Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
Former-commit-id: 64d504df91 [formerly 6bf2eefa2a] [formerly a90a2fe857] [formerly 64d504df91 [formerly 6bf2eefa2a] [formerly a90a2fe857] [formerly 677908868e [formerly a90a2fe857 [formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]]]
Former-commit-id: 677908868e
Former-commit-id: ce0fb925d0 [formerly 75366a9e5a] [formerly aee05b7e732da38b5ee08c9a38d44908e5c23f93 [formerly 216e3d6ad3]]
Former-commit-id: 55067485ebfaa37ed3fc905f2fd5afa3e3797698 [formerly e7d6ad1036]
Former-commit-id: 38e747194a
|
2013-03-01 13:43:50 -06:00 |
|
David Gillingham
|
5d19a4dff7
|
Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.
Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510
Former-commit-id: e2a7d7a350 [formerly ca81ae4a71] [formerly 50744c1f92] [formerly e2a7d7a350 [formerly ca81ae4a71] [formerly 50744c1f92] [formerly 9351f33c1c [formerly 50744c1f92 [formerly 1e72fe30d97504f70352a181de35805a197e50f4]]]]
Former-commit-id: 9351f33c1c
Former-commit-id: 3b9b6e1df6 [formerly 622700dee9] [formerly 4b11b2a5ba7daa34582110049c00325dd999edb7 [formerly 77a3f33fd5]]
Former-commit-id: 3069edcf4f01f8ded0fff59250afd6a7b1fdfcc9 [formerly 4f6b2ffcff]
Former-commit-id: 861a3d0c44
|
2013-03-01 11:05:02 -06:00 |
|
Ben Steffensmeier
|
b487a896ae
|
Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly 86b9a4d8c2 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]]
Former-commit-id: 9263ff1846
Former-commit-id: 9eb0c3e778 [formerly 8f4c2f2a39] [formerly 33c36155057aba55daf29a51f9519c3aef6b6940 [formerly 5a149c5dfa]]
Former-commit-id: 7b6491f72252fd10fa2101e74284719b65bbafb3 [formerly 77aef5f955]
Former-commit-id: c28a151884
|
2013-03-01 11:03:11 -06:00 |
|
Richard Peter
|
c18dde6d25
|
Merge "Issue #1744 actually fix deadlock this time" into omaha_13.3.1
Former-commit-id: 7408f18a45 [formerly f2ae906f93] [formerly 1754861897] [formerly 7408f18a45 [formerly f2ae906f93] [formerly 1754861897] [formerly c50e1cbe1c [formerly 1754861897 [formerly 7eafcb1e677fafadc039a5106f296dbee1245136]]]]
Former-commit-id: c50e1cbe1c
Former-commit-id: c7512064ee [formerly db5e8ed2dd] [formerly 206eb340e21d31137af07955d7ab127460d1b09b [formerly 6fd7af5362]]
Former-commit-id: d1c394304d3868de39f5212e82823b7896f217d2 [formerly a221c92731]
Former-commit-id: 9acad5a1a4
|
2013-03-01 10:50:33 -06:00 |
|
Nate Jensen
|
62e364213a
|
Issue #1744 actually fix deadlock this time
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb
Former-commit-id: eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]]
Former-commit-id: 35007e0460
Former-commit-id: 49fc025594 [formerly 348f5f0f41] [formerly 713be7a0d247874d2807d3b5c3e1411449c3821e [formerly 33da766f63]]
Former-commit-id: 5b126ce31b7b2161f0bb83ad5035f926557f9ab1 [formerly eec5f87ab2]
Former-commit-id: 312e2e07ae
|
2013-03-01 10:48:03 -06:00 |
|
Richard Peter
|
33902e6780
|
Merge "Issue #1744 fix deadlock" into omaha_13.3.1
Former-commit-id: 75f91d596e [formerly ee1b0df106] [formerly 79c70dacbd] [formerly 75f91d596e [formerly ee1b0df106] [formerly 79c70dacbd] [formerly 7dcc007bee [formerly 79c70dacbd [formerly 6fbc789e08a5e6baf7ae6ff1348e1e2c5709c422]]]]
Former-commit-id: 7dcc007bee
Former-commit-id: 734f73d098 [formerly 73ea950d5f] [formerly 8253051531739d9db42149129c7464b598dc4b06 [formerly 3a8a2f5815]]
Former-commit-id: b1a061cbcd5b6041944f70c38515ff25206f20de [formerly 5a05a66757]
Former-commit-id: a34559065c
|
2013-03-01 10:27:36 -06:00 |
|
Nate Jensen
|
8a54597c1f
|
Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: 4f9f0c29d2 [formerly 308de6885f] [formerly d695473b0f] [formerly 4f9f0c29d2 [formerly 308de6885f] [formerly d695473b0f] [formerly 302e851b67 [formerly d695473b0f [formerly 94e54241b7e85c523e019603cd9e815c179dc584]]]]
Former-commit-id: 302e851b67
Former-commit-id: 219bb543e9 [formerly a7cc38e3ba] [formerly 17d1c2aa06f8d4b7fa0a6d445508dd75428bbcf4 [formerly 0d0dfb474f]]
Former-commit-id: a12306c2784585b697737108a31eab10f86b3118 [formerly d03d447447]
Former-commit-id: 65ae433077
|
2013-03-01 10:15:46 -06:00 |
|
Nate Jensen
|
9654c80906
|
Issue #1744 fix deadlock
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f
Former-commit-id: 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]]
Former-commit-id: f4cccabc07
Former-commit-id: 91d577f4db [formerly c5600acf79] [formerly cea33e5e9d7f091f9ec47d746199097bf2783899 [formerly f7ffa22c7c]]
Former-commit-id: 60ba73c04c032b29fe9de5d4eedf3cbfefe3e10c [formerly c990477402]
Former-commit-id: 46ceab84c1
|
2013-03-01 10:12:56 -06:00 |
|
Ben Steffensmeier
|
bf50f7f871
|
Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
Former-commit-id: 1a87c84975 [formerly 74296b32db] [formerly df38a21e11] [formerly 1a87c84975 [formerly 74296b32db] [formerly df38a21e11] [formerly aaffde9bf5 [formerly df38a21e11 [formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]]]
Former-commit-id: aaffde9bf5
Former-commit-id: a8f39fdca4 [formerly f49b8cec68] [formerly f9563e7cebad54220caad3834f5ca36d692dea86 [formerly 453723dc9d]]
Former-commit-id: 7e73c8169da1cde0a25dd8810a1036a321b1213d [formerly dbb965cf9d]
Former-commit-id: 12ce3faeb1
|
2013-02-28 14:04:53 -06:00 |
|
Ben Steffensmeier
|
a295c7abde
|
Issue #1731 Remove unneccessary query in getDataStore.
Former-commit-id: f7148f5a98 [formerly 61875750c1] [formerly 52a64eda01] [formerly f7148f5a98 [formerly 61875750c1] [formerly 52a64eda01] [formerly 38728f3073 [formerly 52a64eda01 [formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]]]
Former-commit-id: 38728f3073
Former-commit-id: 49d61bd471 [formerly 4bdd2946ee] [formerly 6bdf9d288a06719bf4062080d72ce5ced97ff2a3 [formerly 586438b393]]
Former-commit-id: 2f7ffd4a4eb0faed771ab38c9834ada70ff47c1b [formerly 303c30040d]
Former-commit-id: bec51951ec
|
2013-02-28 13:59:02 -06:00 |
|
Richard Peter
|
11cee91c75
|
Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
Former-commit-id: a1fac92d05 [formerly 2950dc9c42] [formerly 1ce1fb213b] [formerly a1fac92d05 [formerly 2950dc9c42] [formerly 1ce1fb213b] [formerly a9ffc8b170 [formerly 1ce1fb213b [formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]]]
Former-commit-id: a9ffc8b170
Former-commit-id: bbb5a8645a [formerly 7adde5c3aa] [formerly 8dc79a2423c207ef96e5603edea8afe8a585ccd7 [formerly c0e0a44e5f]]
Former-commit-id: 6b16d5b6e61e83c66d3031d20530a687254cb1f5 [formerly 93494fcea0]
Former-commit-id: 014bf4250b
|
2013-02-27 16:16:09 -06:00 |
|
Richard Peter
|
01f1a377d6
|
Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
Former-commit-id: 47021a729d [formerly 7c1c44c22f] [formerly 6535c1b6c7] [formerly 47021a729d [formerly 7c1c44c22f] [formerly 6535c1b6c7] [formerly 656d9d74ae [formerly 6535c1b6c7 [formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]]]
Former-commit-id: 656d9d74ae
Former-commit-id: cd794fef64 [formerly b3c0f56954] [formerly dd6610474414ec15f44a01e78340010a011fcac5 [formerly ba4a86de16]]
Former-commit-id: 925ac079efe64ab366bf76d4ad0603aff8fd786a [formerly 706ec91548]
Former-commit-id: 7585176f50
|
2013-02-27 14:46:49 -06:00 |
|