Commit graph

7455 commits

Author SHA1 Message Date
Richard Peter
59e9fe78f2 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 23eafaba3d [formerly 2457d0e6f7] [formerly 23eafaba3d [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 746bbb0885 [formerly f7d8755ba9]
Former-commit-id: bf3ddbb62b
2014-12-12 10:36:04 -06:00
Richard Peter
333701f9f9 Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
Former-commit-id: 46611ec961 [formerly f16173803c] [formerly 46611ec961 [formerly f16173803c] [formerly 08734bb4e1 [formerly dd6f035e86bbd4f9e86ce3b19b7b61c0b3947737]]]
Former-commit-id: 08734bb4e1
Former-commit-id: 2cd131629e [formerly 9c162af96a]
Former-commit-id: a6fff5273d
2014-12-10 17:54:33 -06:00
Dave Hladky
b0468116f5 Omaha #3757 Added HTTPS flag
Former-commit-id: a69c83e534 [formerly 61d25613ab] [formerly a69c83e534 [formerly 61d25613ab] [formerly 337f67b136 [formerly 7848dc4df9ef8faafdce556836bc71c789b74ee4]]]
Former-commit-id: 337f67b136
Former-commit-id: 7d58dacbba [formerly 0e15b23b5f]
Former-commit-id: d5280b3cae
2014-12-10 17:17:12 -06:00
Bryan Kowal
7279d157bb Omaha #3914 - increment yajsw release
Former-commit-id: c2e0b33c19 [formerly aad5e554b9] [formerly c2e0b33c19 [formerly aad5e554b9] [formerly 0b65eb314d [formerly 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a]]]
Former-commit-id: 0b65eb314d
Former-commit-id: 544c5e39eb [formerly 9efc72561b]
Former-commit-id: e3bad2212b
2014-12-10 10:34:26 -06:00
Lee Venable
d356113cec Merge "Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list" into omaha_14.4.1
Former-commit-id: 28540e441e [formerly 9a4f87fe8f] [formerly 28540e441e [formerly 9a4f87fe8f] [formerly 6b346b22e0 [formerly d1e058cfdac1e61119308538eeaab34097f65ba2]]]
Former-commit-id: 6b346b22e0
Former-commit-id: 52aca5c7ab [formerly 165b3fcb64]
Former-commit-id: 77d5d861f8
2014-12-09 12:54:03 -06:00
Mark Peters
c75be31133 Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57

Former-commit-id: e1bf45baef [formerly a721ccbcac] [formerly e1bf45baef [formerly a721ccbcac] [formerly 1880d72b9d [formerly 447437edc9b14412615ff691784fa7545146a596]]]
Former-commit-id: 1880d72b9d
Former-commit-id: 2c8f6b6132 [formerly dbceca27e6]
Former-commit-id: 8496792ecd
2014-12-09 11:47:22 -06:00
David Gillingham
64e7bcd723 Omaha #3885: Fix purging of practice VTECproducts when submitted in simulated time.
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098

Former-commit-id: 02af20bcd9 [formerly a41cc32a40] [formerly 02af20bcd9 [formerly a41cc32a40] [formerly ae5a0f55d1 [formerly 35ae2af301ec8b66a65e1564c17f6e3f8d7623d2]]]
Former-commit-id: ae5a0f55d1
Former-commit-id: 4ed1f30c04 [formerly 877d75d520]
Former-commit-id: cb407d5749
2014-12-09 11:21:29 -06:00
Lee Venable
8bc4569507 Merge "Omaha #3873 - Fixed assigning timeObs for maritime record." into omaha_14.4.1
Former-commit-id: d36bb7a1d3 [formerly 5cdd52f6b2] [formerly d36bb7a1d3 [formerly 5cdd52f6b2] [formerly a60130beba [formerly be1232a4e28bcd039bbe7c150932fd982212019d]]]
Former-commit-id: a60130beba
Former-commit-id: c71cd09b83 [formerly e9cd246339]
Former-commit-id: b5336562fa
2014-12-08 12:57:54 -06:00
Nathan Bowler
091648a348 Omaha #1231 Fix selecting AWIPS ID
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e

Former-commit-id: 3baaa2ea5e [formerly c07d774bd0] [formerly 3baaa2ea5e [formerly c07d774bd0] [formerly 06c94a25b7 [formerly 68e6a2fd48a062e0ca66b52098f2781a30926a80]]]
Former-commit-id: 06c94a25b7
Former-commit-id: f72df72bc1 [formerly b25d850fbb]
Former-commit-id: 4f917a9642
2014-12-08 13:07:14 -05:00
Richard Peter
74114ac482 Merge "Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled" into omaha_14.4.1
Former-commit-id: d0c2a515e7 [formerly 628324ee3c] [formerly d0c2a515e7 [formerly 628324ee3c] [formerly 25dd53d440 [formerly 59d1091dfcf6df87d0eb30e175c863556ab73d14]]]
Former-commit-id: 25dd53d440
Former-commit-id: e846cafe51 [formerly 27b41a0550]
Former-commit-id: ca376b5a92
2014-12-05 14:44:52 -06:00
Nathan Bowler
9c06b6c433 Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled
Change-Id: I982e959f2c4ebe7b26ee1aa615953228b9781474

Former-commit-id: 907425cb04 [formerly 59f4baa5fe] [formerly 907425cb04 [formerly 59f4baa5fe] [formerly 18e1ede6a1 [formerly 32621b600176a3afff5ee42228eb8cee2417c9c6]]]
Former-commit-id: 18e1ede6a1
Former-commit-id: 28a002c7ee [formerly 1fa26e89c6]
Former-commit-id: bf66115f2f
2014-12-05 15:31:46 -05:00
Slav Korolev
3b7f93daae Omaha #3873 - Fixed assigning timeObs for maritime record.
Former-commit-id: 4b43ae6fb4 [formerly 090bc93302] [formerly 4b43ae6fb4 [formerly 090bc93302] [formerly 63026ac59b [formerly ccdf4928b9527e85684fb0d4eaa67435f8da5559]]]
Former-commit-id: 63026ac59b
Former-commit-id: 7d0803fcb1 [formerly f697594b73]
Former-commit-id: 574b4b694f
2014-12-05 14:29:15 -05:00
Roger Ferrel
b0d8f553da Omaha #3658 Scale arrows and use consistent units.
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899

Former-commit-id: faea9e0ddc [formerly 5d91f976af] [formerly faea9e0ddc [formerly 5d91f976af] [formerly 64b8d193f4 [formerly 0f0eafd8687edc0c10ef21495175f1e68f926577]]]
Former-commit-id: 64b8d193f4
Former-commit-id: 526cfcb77d [formerly 335f9b862e]
Former-commit-id: 526855c99a
2014-12-05 11:54:27 -06:00
Bryan Kowal
3ec292bebb Omaha #3508 - remove references to yajsw in %files
Former-commit-id: 16a33efd8b [formerly 9e55db1c52] [formerly 16a33efd8b [formerly 9e55db1c52] [formerly 9e77b9635e [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]]
Former-commit-id: 9e77b9635e
Former-commit-id: 5644901634 [formerly 7575599185]
Former-commit-id: cc4ee08244
2014-12-05 10:04:42 -06:00
Bryan Kowal
02cd2719af Omaha #3508 - fix deploy-install for yajsw.
Former-commit-id: 4827d5b8fc [formerly 0d773ebd42] [formerly 4827d5b8fc [formerly 0d773ebd42] [formerly 90f15ff22c [formerly 75cf2b3e03ad446408c3d201e6e36bde5f1095f2]]]
Former-commit-id: 90f15ff22c
Former-commit-id: f649b34f06 [formerly 9779219edb]
Former-commit-id: 8d09387266
2014-12-05 09:38:47 -06:00
Bryan Kowal
258f7a93ca Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: 289689e774 [formerly 19f6551c88] [formerly 289689e774 [formerly 19f6551c88] [formerly 48ec32e595 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]
Former-commit-id: 48ec32e595
Former-commit-id: aba4679eb6 [formerly 9f5297504d]
Former-commit-id: ec8371db52
2014-12-05 09:20:23 -06:00
Greg Armendariz
d4560e66b4 Merge "Omaha #3836 - initial commit of the groovy-based developer deployment." into omaha_14.4.1
Former-commit-id: 6764a49df5 [formerly d1ba788a61] [formerly 6764a49df5 [formerly d1ba788a61] [formerly d2691afb97 [formerly 4edea3f19307e0aeb100e8fe21852994baef9c94]]]
Former-commit-id: d2691afb97
Former-commit-id: 57e23b70d9 [formerly a53ee54262]
Former-commit-id: b59186424c
2014-12-05 08:57:51 -06:00
Greg Armendariz
f1b203fec9 Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
Former-commit-id: f6f50778c7 [formerly 8803a6b658] [formerly f6f50778c7 [formerly 8803a6b658] [formerly 610f38e9ef [formerly 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23]]]
Former-commit-id: 610f38e9ef
Former-commit-id: 1e78bd8898 [formerly f307a34150]
Former-commit-id: 2d6ab26fd8
2014-12-05 08:57:37 -06:00
Greg Armendariz
c3008b22d6 Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1
Former-commit-id: 73e48f7b1d [formerly 83ca3b5381] [formerly 73e48f7b1d [formerly 83ca3b5381] [formerly ed42ecc0e8 [formerly f310e13350ba8e64e313d99a7d03d0ef3cdc6aba]]]
Former-commit-id: ed42ecc0e8
Former-commit-id: 1fac1cb693 [formerly 9883443470]
Former-commit-id: c87e692d9c
2014-12-05 08:57:08 -06:00
Greg Armendariz
37b95a1466 Merge "Omaha #3216 - update postgres to use geos 3.4.2" into omaha_14.4.1
Former-commit-id: ac92e7a1fd [formerly de088ca65b] [formerly ac92e7a1fd [formerly de088ca65b] [formerly 180a1cb4f2 [formerly e524cc13694ea30fdb7ab1d8879218be4650fed6]]]
Former-commit-id: 180a1cb4f2
Former-commit-id: aff37e4517 [formerly e4893b65d7]
Former-commit-id: 4cf0c5d0f4
2014-12-05 08:46:03 -06:00
Nate Jensen
4ae23f7e92 Omaha #3015 correct usage of Coordinate(lon, lat)
Change-Id: I30029df3e963ee16e2612d5e9f29e7a0ca05a7a8

Former-commit-id: a4db5e625f [formerly 0c59decfc3] [formerly a4db5e625f [formerly 0c59decfc3] [formerly 4a934687aa [formerly 67c3f28fa0edf3aa41726c6a9d2f18b5af586ab1]]]
Former-commit-id: 4a934687aa
Former-commit-id: 7295b6606e [formerly 3bcac4fb47]
Former-commit-id: 4582a5c05c
2014-12-04 19:05:38 -06:00
Bryan Kowal
8ac5284fff Omaha #3508 - purge non-centralized yajsw distributions
amend: ensure edex is dependent on yajsw

Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55

Former-commit-id: cf5353e368 [formerly 71cf313666] [formerly cf5353e368 [formerly 71cf313666] [formerly 0894efaaa3 [formerly 9b36754ca610887a17666ceff2a1540b958913b6]]]
Former-commit-id: 0894efaaa3
Former-commit-id: 3c95967633 [formerly ccb7cead64]
Former-commit-id: d55f5e0c63
2014-12-04 17:33:43 -06:00
David Gillingham
e9421cc1cc Omaha #3885: Fix build.
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f

Former-commit-id: 26b92860af [formerly b9fe617d57] [formerly 26b92860af [formerly b9fe617d57] [formerly 9c7eff77f6 [formerly ce395804bdc86e1ea485794a0af3f931c83f3cfa]]]
Former-commit-id: 9c7eff77f6
Former-commit-id: bc993fd5f3 [formerly 5714cf8dac]
Former-commit-id: bd06453882
2014-12-04 17:00:00 -06:00
Bryan Kowal
40434c2d72 Omaha #3508 - created the yajsw rpm
Former-commit-id: a89e9d96b9 [formerly 8be5362dbd] [formerly a89e9d96b9 [formerly 8be5362dbd] [formerly 127db6aaee [formerly 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21]]]
Former-commit-id: 127db6aaee
Former-commit-id: aa0f4129c4 [formerly c3bb142d88]
Former-commit-id: 27686d8783
2014-12-04 16:26:55 -06:00
Bryan Kowal
a6b73f0507 Omaha #3836 - initial commit of the groovy-based developer deployment.
Please refer to the: build/deploy.edex/ReadMe.txt

amend: remove files that are not used by the developer deployment

Change-Id: I7caaf61e88d315ea0d065d46036d3ba9530c29ec

Former-commit-id: dc5cae7ea1 [formerly c963a90ce0] [formerly dc5cae7ea1 [formerly c963a90ce0] [formerly 5b7f86d9d4 [formerly d881ba5d55c41647e5b3c4dfecd7ea89ad7ec2eb]]]
Former-commit-id: 5b7f86d9d4
Former-commit-id: 28f6a3a613 [formerly 176d002ad4]
Former-commit-id: 5f3ca819dd
2014-12-04 16:17:53 -06:00
Ron Anderson
3d87784ba6 Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1
Former-commit-id: c4d27803cc [formerly d7e0d21d27] [formerly c4d27803cc [formerly d7e0d21d27] [formerly e0b9900a50 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]]]
Former-commit-id: e0b9900a50
Former-commit-id: 9e61a12c32 [formerly 3d7d560a9e]
Former-commit-id: c34aa4047a
2014-12-04 15:44:46 -06:00
Ron Anderson
6b286bedf7 Merge "Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region." into omaha_14.4.1
Former-commit-id: 95df807187 [formerly d19865d5d1] [formerly 95df807187 [formerly d19865d5d1] [formerly 1a26141b89 [formerly 518b6de2a22f8ce80ee90f16fb8bf387e428909f]]]
Former-commit-id: 1a26141b89
Former-commit-id: 1abd76d91d [formerly 2c7983c262]
Former-commit-id: 11932beb18
2014-12-04 13:55:24 -06:00
Nate Jensen
d0e4ee817f Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
Former-commit-id: 8f0375f71e [formerly 47b8be5b09] [formerly 8f0375f71e [formerly 47b8be5b09] [formerly 13bd914319 [formerly 84412d1185073ed35278a40150b04845c8a98de3]]]
Former-commit-id: 13bd914319
Former-commit-id: 0d0df3a330 [formerly 2c282f9565]
Former-commit-id: bf0facbe67
2014-12-04 13:24:19 -06:00
Roger Ferrel
eb2b8da234 Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a

Former-commit-id: 24c969a249 [formerly 462e0d85c0] [formerly 24c969a249 [formerly 462e0d85c0] [formerly 597fdb8280 [formerly 46d3bbcc99d93845dcb159012b872fe746756b7c]]]
Former-commit-id: 597fdb8280
Former-commit-id: 2d0ce5952d [formerly c9f619028d]
Former-commit-id: ab0c6581b2
2014-12-04 12:52:22 -06:00
Fay.Liang
c4434a7051 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 6e9ff9e139 [formerly 028d6bdc33] [formerly 6e9ff9e139 [formerly 028d6bdc33] [formerly f5095bed4e [formerly ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963]]]
Former-commit-id: f5095bed4e
Former-commit-id: 05120de669 [formerly 2c766a5b28]
Former-commit-id: 5bccfb2329
2014-12-04 13:47:03 -05:00
Fay.Liang
5f6842175d Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: f327b9dd5a [formerly 83a4987188] [formerly f327b9dd5a [formerly 83a4987188] [formerly 19194e0aa3 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]]
Former-commit-id: 19194e0aa3
Former-commit-id: 3404290a55 [formerly 19d1be03e0]
Former-commit-id: d3c8b8a470
2014-12-04 13:46:31 -05:00
Nathan Bowler
ac5318dff8 Omaha #3848 Fix cancelling geotiff import.
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463

Former-commit-id: a5bc553461 [formerly 3e7a1993e3] [formerly a5bc553461 [formerly 3e7a1993e3] [formerly e1af24d84e [formerly 4c64044de959e709cd00da40826b916a579c44fe]]]
Former-commit-id: e1af24d84e
Former-commit-id: e446d63e7d [formerly af2193ed2c]
Former-commit-id: a6e2f72f84
2014-12-04 13:24:04 -05:00
Greg Armendariz
532891c6b7 Omaha #3216 - update postgres to use geos 3.4.2
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b

Former-commit-id: 515aa32cc6 [formerly 6dd90bb25a] [formerly 515aa32cc6 [formerly 6dd90bb25a] [formerly 1b1064d541 [formerly 453247c7731adb5e1ca4e58306d14715c0f3a350]]]
Former-commit-id: 1b1064d541
Former-commit-id: fa7fef1605 [formerly aba34ca613]
Former-commit-id: 88cd053b81
2014-12-04 11:34:45 -06:00
Nate Jensen
0278b68237 Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
Former-commit-id: 7fe0fc4cb9 [formerly cc41245a73] [formerly 7fe0fc4cb9 [formerly cc41245a73] [formerly d4ce4aab6b [formerly 96183baeadd2dcfdc4a1dd0e9199b728f49209bf]]]
Former-commit-id: d4ce4aab6b
Former-commit-id: 064962d97b [formerly 2ac1d5a369]
Former-commit-id: 925b9fcba9
2014-12-04 11:28:01 -06:00
Mark Peters
56c2821d3a Omaha #3709 Support foreground/background colors by user for group chats without shared display
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa

Former-commit-id: 1b30658214 [formerly bd3ed3935c] [formerly 1b30658214 [formerly bd3ed3935c] [formerly 7ae71cf1dc [formerly 73d8510ef265b47d2d45f36be3609ef8f35ece12]]]
Former-commit-id: 7ae71cf1dc
Former-commit-id: 881018690f [formerly b8c96687c3]
Former-commit-id: f1d2c729fb
2014-12-04 10:37:53 -06:00
Ron Anderson
3be3ae232b Omaha #3885: Merge VTEC route and request changes from VLab.
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.

Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9

Former-commit-id: fd25fe9efc [formerly 5169e7181f] [formerly fd25fe9efc [formerly 5169e7181f] [formerly 2417d5a2a7 [formerly 16e32018de233fb128a7518415b84e032074932f]]]
Former-commit-id: 2417d5a2a7
Former-commit-id: 2d30089bbe [formerly a882a8f0d1]
Former-commit-id: 89ce99fde1
2014-12-04 10:01:18 -06:00
Richard Peter
38f1768dbf Merge "Omaha #3549 remove jdt prefs for faster builds" into omaha_14.4.1
Former-commit-id: e7b3f59131 [formerly cdb38349fb] [formerly e7b3f59131 [formerly cdb38349fb] [formerly d03177a68a [formerly b9afcd679acd000742ad31944b234118b6973946]]]
Former-commit-id: d03177a68a
Former-commit-id: 4689d3510f [formerly 4ba786caf6]
Former-commit-id: de2538521e
2014-12-04 09:45:48 -06:00
Nate Jensen
580f9e803b Omaha #3549 fix developer deploy
Change-Id: I6905a40f421df5f35688c90528e5731b7bb0d8dd

Former-commit-id: 36d8702286 [formerly 0ffdb0ff98] [formerly 36d8702286 [formerly 0ffdb0ff98] [formerly 99fa52c311 [formerly a713b9c70f48995fa52fc76a4d6db8712e3257e7]]]
Former-commit-id: 99fa52c311
Former-commit-id: b3665bebea [formerly 3e45aa78db]
Former-commit-id: 27a14f3a1b
2014-12-04 09:05:54 -06:00
Nate Jensen
a6230a400b Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: c4ffdbc7e8 [formerly 7fed5d8e25] [formerly c4ffdbc7e8 [formerly 7fed5d8e25] [formerly 68973ea94c [formerly 0a84cfa53c5565f3bf598b21aa5a7d71bc012543]]]
Former-commit-id: 68973ea94c
Former-commit-id: 58c12ff7b5 [formerly 1bb305290f]
Former-commit-id: 6ea7f5572f
2014-12-04 09:00:45 -06:00
Nate Jensen
cc63c5c2f3 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I3dc9ba8622a9312b29fb052ac0c95e87d808f9ec

Former-commit-id: 62dda63dab [formerly a8cfb57aef] [formerly 62dda63dab [formerly a8cfb57aef] [formerly 19cfdd12f4 [formerly 355f20818dc20b86de630e29cb18647c5878f118]]]
Former-commit-id: 19cfdd12f4
Former-commit-id: ba1ed761d0 [formerly 1bf02a52ae]
Former-commit-id: 59f8e0233e
2014-12-03 18:00:03 -06:00
Nate Jensen
875642c489 Omaha #3549 remove dead code
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2

Former-commit-id: cb745b34f3 [formerly 19d14b6107] [formerly cb745b34f3 [formerly 19d14b6107] [formerly 25e09348c0 [formerly 70209fbc92c5459dab007224e1f5783a5bb08fd0]]]
Former-commit-id: 25e09348c0
Former-commit-id: 27c14d5cc9 [formerly a126a2290b]
Former-commit-id: 20fef1386d
2014-12-03 17:35:08 -06:00
Ben Steffensmeier
10bf5b2438 Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 8c69731c75 [formerly 65431db2c9] [formerly 8c69731c75 [formerly 65431db2c9] [formerly 47d1ae9825 [formerly 58946bb4ff319ac5c4c84e63268ec1149c9cede0]]]
Former-commit-id: 47d1ae9825
Former-commit-id: 58580b09a1 [formerly e9e4caa755]
Former-commit-id: f74fbb95b7
2014-12-03 17:14:42 -06:00
Lee Venable
ff103b19ea Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
Former-commit-id: 8cb91f471b [formerly 3acfa2eda5] [formerly 8cb91f471b [formerly 3acfa2eda5] [formerly 5ab799b56f [formerly ab453bf60d663e731dcf273aeabf07472a061d90]]]
Former-commit-id: 5ab799b56f
Former-commit-id: 436259994f [formerly a606683c81]
Former-commit-id: 729971f9c8
2014-12-03 16:49:48 -06:00
Nate Jensen
2941ebd3f3 Omaha #3549 remove dead code
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6

Former-commit-id: a651246f08 [formerly ac98f9730c] [formerly a651246f08 [formerly ac98f9730c] [formerly 1b4db26cd8 [formerly b597b4e3151d4e91b3e1db1a02135d33014850d8]]]
Former-commit-id: 1b4db26cd8
Former-commit-id: 11d70597df [formerly 3c3437b8cc]
Former-commit-id: 4b4b404d0d
2014-12-03 16:21:10 -06:00
Nate Jensen
0bb18f02d0 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 6c1391e938 [formerly ec28d2f1a0] [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 1c5057a13f [formerly 291de3f039]
Former-commit-id: e53063661e
2014-12-03 15:47:10 -06:00
Nate Jensen
6c893a5db3 Omaha #3549 fix frozen time sizing
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141

Former-commit-id: 5b7fd51d75 [formerly e78c319329] [formerly 5b7fd51d75 [formerly e78c319329] [formerly d26ba30c88 [formerly 5d4601f7c15323a9f926a325656843e5092e23bb]]]
Former-commit-id: d26ba30c88
Former-commit-id: 203804a5fc [formerly 0ad33b4c53]
Former-commit-id: b694406add
2014-12-03 14:29:52 -06:00
Nate Jensen
4514e47abd Merge "Omaha #3831 Alleviate memory usage in Template creation Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2" into omaha_14.4.1
Former-commit-id: bb05069c21 [formerly 55817ea845] [formerly bb05069c21 [formerly 55817ea845] [formerly 3b0fdec2e5 [formerly 306c64193d02d065bba1c792e13aa34bafb6e9c3]]]
Former-commit-id: 3b0fdec2e5
Former-commit-id: a28ff122d1 [formerly 23f34891a9]
Former-commit-id: 9e23d82ad0
2014-12-03 14:14:36 -06:00
Juliya Dynina
b605a89c50 Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
Former-commit-id: d49e57a971 [formerly c431691d06] [formerly d49e57a971 [formerly c431691d06] [formerly 354a421da7 [formerly 2ebcc016732b0405b183b0e4e56d528a24e9cbdf]]]
Former-commit-id: 354a421da7
Former-commit-id: de28a15f08 [formerly 3466788534]
Former-commit-id: c4ba582ff4
2014-12-03 14:40:12 -05:00
Dave Hladky
18b9975708 Omaha #3831 Alleviate memory usage in Template creation
Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2

Former-commit-id: 53d1b4a0c3 [formerly 3c2f18f454] [formerly 53d1b4a0c3 [formerly 3c2f18f454] [formerly 45ebc9cd05 [formerly dd40b635fa20789be1f4a8502530e00f264c7966]]]
Former-commit-id: 45ebc9cd05
Former-commit-id: 8d8d9ae712 [formerly c8ca0f8cc0]
Former-commit-id: 89dc7ffa97
2014-12-03 12:39:04 -06:00
steve.naples
872c537dbe ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4

Former-commit-id: 91c240f8bd [formerly c4fad58bd9] [formerly 91c240f8bd [formerly c4fad58bd9] [formerly b5389ced26 [formerly 862cb7c4d789915067558c4508cf5f1e45a2cdf2]]]
Former-commit-id: b5389ced26
Former-commit-id: ffe6a3d92f [formerly f33429b6f0]
Former-commit-id: 21f7cc1c0d
2014-12-03 18:35:19 +00:00